haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a wxWidgets assertion. Newer wxWidgets (3.1) display a message saying that horizontal alignment flags are ignored with wxEXPAND.

This commit is contained in:
Maciej Suminski 2016-05-02 15:56:12 +02:00
parent f968556f9a
commit da312db7a4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3d-viewer/3d_cache/dialogs/panel_prev_model.cpp
View File

@ -235,7 +235,7 @@ PANEL_PREV_3D::PANEL_PREV_3D( wxWindow* aParent, S3D_CACHE* aCacheManager ) :
preview = new wxPanel( this, -1 ); preview = new wxPanel( this, -1 );
preview->SetMinSize( wxSize( 320, 200 ) ); preview->SetMinSize( wxSize( 320, 200 ) );
preview->SetBackgroundColour( wxColor( 0, 0, 0 )); preview->SetBackgroundColour( wxColor( 0, 0, 0 ));
vboxPrev->Add( preview, 1, wxEXPAND | wxALIGN_CENTER | wxLEFT | wxRIGHT, 5 ); vboxPrev->Add( preview, 1, wxEXPAND | wxLEFT | wxRIGHT, 5 );
// buttons: // buttons:
wxButton* vFront = new wxButton( this, ID_3D_FRONT, wxT( "F" ) ); wxButton* vFront = new wxButton( this, ID_3D_FRONT, wxT( "F" ) );
wxButton* vBack = new wxButton( this, ID_3D_BACK, wxT( "B" ) ); wxButton* vBack = new wxButton( this, ID_3D_BACK, wxT( "B" ) );

4
common/gal/graphics_abstraction_layer.cpp
View File

@ -51,7 +51,7 @@ GAL::GAL() :
SetLayerDepth( 0.0 ); SetLayerDepth( 0.0 );
SetFlip( false, false ); SetFlip( false, false );
SetLineWidth( 1.0 ); SetLineWidth( 1.0 );
ComputeWorldScale(); computeWorldScale();
// Set grid defaults // Set grid defaults
SetGridVisibility( true ); SetGridVisibility( true );
@ -95,7 +95,7 @@ VECTOR2D GAL::GetTextLineSize( const UTF8& aText ) const
void GAL::ComputeWorldScreenMatrix() void GAL::ComputeWorldScreenMatrix()
{ {
ComputeWorldScale(); computeWorldScale();
worldScreenMatrix.SetIdentity(); worldScreenMatrix.SetIdentity();

2
include/gal/graphics_abstraction_layer.h
View File

@ -909,7 +909,7 @@ protected:
STROKE_FONT strokeFont; STROKE_FONT strokeFont;
/// Compute the scaling factor for the world->screen matrix /// Compute the scaling factor for the world->screen matrix
inline void ComputeWorldScale() inline void computeWorldScale()
{ {
worldScale = screenDPI * worldUnitLength * zoomFactor; worldScale = screenDPI * worldUnitLength * zoomFactor;
} }