Added GAL_TYPE_NONE as an indicator of GAL uninitialized state.
This commit is contained in:
parent
e7b7e0e687
commit
876bf75d89
|
@ -51,9 +51,10 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
|
|||
GalType aGalType ) :
|
||||
wxWindow( aParentWindow, aWindowId, aPosition, aSize )
|
||||
{
|
||||
m_gal = NULL;
|
||||
m_view = NULL;
|
||||
m_painter = NULL;
|
||||
m_gal = NULL;
|
||||
m_currentGal = GAL_TYPE_NONE;
|
||||
m_view = NULL;
|
||||
m_painter = NULL;
|
||||
|
||||
wxStandardPaths paths;
|
||||
wxFileName executableFile( paths.GetExecutablePath() );
|
||||
|
@ -158,8 +159,7 @@ void EDA_DRAW_PANEL_GAL::SwitchBackend( GalType aGalType, bool aUseShaders )
|
|||
if( aGalType == m_currentGal && aUseShaders == m_useShaders && m_gal != NULL )
|
||||
return;
|
||||
|
||||
if( m_gal )
|
||||
delete m_gal;
|
||||
delete m_gal;
|
||||
|
||||
switch( aGalType )
|
||||
{
|
||||
|
@ -171,6 +171,9 @@ void EDA_DRAW_PANEL_GAL::SwitchBackend( GalType aGalType, bool aUseShaders )
|
|||
case GAL_TYPE_CAIRO:
|
||||
m_gal = new KiGfx::CAIRO_GAL( this, this, this );
|
||||
break;
|
||||
|
||||
case GAL_TYPE_NONE:
|
||||
return;
|
||||
}
|
||||
|
||||
m_gal->SetWorldUnitLength( 1.0 / METRIC_UNIT_LENGTH * 2.54 ); // 1 inch in nanometers
|
||||
|
|
|
@ -50,6 +50,7 @@ class EDA_DRAW_PANEL_GAL : public wxWindow
|
|||
{
|
||||
public:
|
||||
enum GalType {
|
||||
GAL_TYPE_NONE, ///< Not used
|
||||
GAL_TYPE_OPENGL, ///< OpenGL implementation
|
||||
GAL_TYPE_CAIRO, ///< Cairo implementation
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue