Skip to content

K
kicad-source-mirror
Commit 1c0f034b authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files
Options

Make KiCad compile with minimal warnings against SVN HEAD of wxWidgets as of today.

parent fe919cd4
Hide whitespace changes
Inline Side-by-side
Showing with 243 additions and 160 deletions
3d-viewer/x3dmodelparser.cpp
View file @ 1c0f034b
......@@ -36,8 +36,10 @@
#include <queue>
#include <vector>
#include "3d_struct.h"
#include "modelparsers.h"
#include <3d_struct.h>
#include <modelparsers.h>
#include <xnode.h>
X3D_MODEL_PARSER::X3D_MODEL_PARSER( S3D_MASTER* aMaster ) :
S3D_MODEL_PARSER( aMaster )
......@@ -54,13 +56,13 @@ void X3D_MODEL_PARSER::Load( const wxString aFilename )
if( !doc.Load( aFilename ) )
{
wxLogError( wxT( "Error while parsing file <%s>" ), GetChars( aFilename ) );
wxLogError( wxT( "Error while parsing file '%s'" ), GetChars( aFilename ) );
return;
}
if( doc.GetRoot()->GetName() != wxT( "X3D" ) )
{
wxLogError( wxT( "Filetype is not X3D <%s>" ), GetChars( aFilename ) );
wxLogError( wxT( "Filetype is not X3D '%s'" ), GetChars( aFilename ) );
return;
}
......@@ -85,24 +87,25 @@ wxString X3D_MODEL_PARSER::VRML_representation()
for( unsigned i = 0; i < vrml_points.size(); i++ )
{
output += wxT( "Shape {\n"
" appearance Appearance {\n"
" material Material {\n" ) +
vrml_materials[i] +
wxT( " }\n"
" }\n"
" geometry IndexedFaceSet {\n"
" solid TRUE\n"
" coord Coordinate {\n"
" point [\n") +
vrml_points[i] +
wxT( " ]\n"
" }\n"
" coordIndex [\n" ) +
vrml_coord_indexes[i] +
wxT( " ]\n"
" }\n"
"},\n" );
output +=
wxT( "Shape {\n"
" appearance Appearance {\n"
" material Material {\n" ) +
vrml_materials[i] +
wxT( " }\n"
" }\n"
" geometry IndexedFaceSet {\n"
" solid TRUE\n"
" coord Coordinate {\n"
" point [\n") +
vrml_points[i] +
wxT( " ]\n"
" }\n"
" coordIndex [\n" ) +
vrml_coord_indexes[i] +
wxT( " ]\n"
" }\n"
"},\n" );
}
return output;
......@@ -115,6 +118,7 @@ void X3D_MODEL_PARSER::GetChildsByName( wxXmlNode* aParent,
{
// Breadth-first search (BFS)
std::queue< wxXmlNode* > found;
found.push( aParent );
while( !found.empty() )
......@@ -140,7 +144,7 @@ void X3D_MODEL_PARSER::GetChildsByName( wxXmlNode* aParent,
void X3D_MODEL_PARSER::GetNodeProperties( wxXmlNode* aNode, PROPERTY_MAP& aProps )
{
wxXmlProperty *prop;
wxXmlAttribute* prop;
for( prop = aNode->GetAttributes();
prop != NULL;
......@@ -167,6 +171,7 @@ void X3D_MODEL_PARSER::readTransform( wxXmlNode* aTransformNode )
childnodes.clear();
PROPERTY_MAP properties;
GetNodeProperties( aTransformNode, properties );
GetChildsByName( aTransformNode, wxT("IndexedFaceSet"), childnodes );
......@@ -252,7 +257,7 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
wxString vrml_material;
PROPERTY_MAP::const_iterator p = ++properties.begin(); // skip DEF
for(;p != properties.end();p++)
for( ; p != properties.end(); p++ )
{
vrml_material.Append( p->first + wxT( " " ) + p->second + wxT( "\n" ) );
}
......@@ -270,8 +275,8 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
{
if( material->m_Name == mat_name )
{
wxString vrml_material;
vrml_material.Append( wxString::Format( wxT( "specularColor %f %f %f\n" ),
material->m_SpecularColor.x,
material->m_SpecularColor.y,
......@@ -457,6 +462,7 @@ void X3D_MODEL_PARSER::readIndexedFaceSet( wxXmlNode* aFaceNode,
while( index_tokens.HasMoreTokens() )
{
long index = 0;
index_tokens.GetNextToken().ToLong( &index );
// -1 marks the end of polygon
......
common/basicframe.cpp
View file @ 1c0f034b
......@@ -480,7 +480,12 @@ static inline const char* KICAD_BUILD_OPTIONS_SIGNATURE()
" (release,"
#endif
__WX_BO_UNICODE __ABI_VERSION __BO_COMPILER __WX_BO_STL
__WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 ")"
#if !wxCHECK_VERSION( 3, 0, 0 )
__WX_BO_WXWIN_COMPAT_2_6
#endif
__WX_BO_WXWIN_COMPAT_2_8 ")"
;
}
......
common/class_layer_box_selector.cpp
View file @ 1c0f034b
......@@ -41,7 +41,12 @@ void LAYER_SELECTOR::SetBitmapLayer( wxBitmap& aLayerbmp, LAYER_NUM aLayer )
// Prepare Bitmap
bmpDC.SelectObject( aLayerbmp );
brush.SetColour( MakeColour( GetLayerColor( aLayer ) ) );
#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
#else
brush.SetStyle( wxSOLID );
#endif
bmpDC.SetBrush( brush );
bmpDC.DrawRectangle( 0, 0, aLayerbmp.GetWidth(), aLayerbmp.GetHeight() );
......
common/gr_basic.cpp
View file @ 1c0f034b
......@@ -396,15 +396,22 @@ void GRSetBrush( wxDC* DC, EDA_COLOR_T Color, bool fill )
|| s_DC_lastbrushfill != fill
|| s_DC_lastDC != DC )
{
wxBrush DrawBrush;
DrawBrush.SetColour( MakeColour( Color ) );
wxBrush brush;
brush.SetColour( MakeColour( Color ) );
if( fill )
DrawBrush.SetStyle( wxSOLID );
#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
else
brush.SetStyle( wxBRUSHSTYLE_TRANSPARENT );
#else
brush.SetStyle( wxSOLID );
else
DrawBrush.SetStyle( wxTRANSPARENT );
brush.SetStyle( wxTRANSPARENT );
#endif
DC->SetBrush( DrawBrush );
DC->SetBrush( brush );
s_DC_lastbrushcolor = Color;
s_DC_lastbrushfill = fill;
......
common/msgpanel.cpp
View file @ 1c0f034b
......@@ -239,7 +239,12 @@ void EDA_MSG_PANEL::erase( wxDC* aDC )
pen.SetColour( color );
brush.SetColour( color );
#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
#else
brush.SetStyle( wxSOLID );
#endif
aDC->SetPen( pen );
aDC->SetBrush( brush );
......
common/selcolor.cpp
View file @ 1c0f034b
......@@ -160,14 +160,23 @@ void WinEDA_SelColorFrame::Init_Dialog( int aOldColor )
butt_ID = ID_COLOR_BLACK + ii;
wxMemoryDC iconDC;
wxBitmap ButtBitmap( w, h );
wxBrush Brush;
wxBrush brush;
iconDC.SelectObject( ButtBitmap );
EDA_COLOR_T buttcolor = g_ColorRefs[ii].m_Numcolor;
iconDC.SetPen( *wxBLACK_PEN );
ColorSetBrush( &Brush, buttcolor );
Brush.SetStyle( wxSOLID );
ColorSetBrush( &brush, buttcolor );
#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
#else
brush.SetStyle( wxSOLID );
#endif
iconDC.SetBrush( brush );
iconDC.SetBrush( Brush );
iconDC.SetBackground( *wxGREY_BRUSH );
iconDC.Clear();
iconDC.DrawRoundedRectangle( 0, 0, w, h, (double) h / 3 );
......
common/xnode.cpp
View file @ 1c0f034b
......@@ -26,7 +26,7 @@
#include <xnode.h>
#include <macros.h>
typedef wxXmlProperty XATTR;
typedef wxXmlAttribute XATTR;
void XNODE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
......
eeschema/dialogs/dialog_color_config.cpp
View file @ 1c0f034b
......@@ -16,53 +16,73 @@
#define ID_COLOR_SETUP 1800
// Specify the width and height of every (color-displaying / bitmap) button
const int BUTT_SIZE_X = 16;
const int BUTT_SIZE_Y = 16;
static ColorButton GeneralColorButtons[] = {
{ _( "Wire" ), LAYER_WIRE },
{ _( "Bus" ), LAYER_BUS },
{ _( "Junction" ), LAYER_JUNCTION },
{ _( "Label" ), LAYER_LOCLABEL },
{ _( "Global label" ), LAYER_GLOBLABEL },
{ _( "Net name" ), LAYER_NETNAM },
{ _( "Notes" ), LAYER_NOTES },
/********************/
/* Layer menu list. */
/********************/
struct COLORBUTTON
{
wxString m_Name;
int m_Layer;
};
struct BUTTONINDEX
{
wxString m_Name;
COLORBUTTON* m_Buttons;
};
static COLORBUTTON generalColorButtons[] = {
{ _( "Wire" ), LAYER_WIRE },
{ _( "Bus" ), LAYER_BUS },
{ _( "Junction" ), LAYER_JUNCTION },
{ _( "Label" ), LAYER_LOCLABEL },
{ _( "Global label" ), LAYER_GLOBLABEL },
{ _( "Net name" ), LAYER_NETNAM },
{ _( "Notes" ), LAYER_NOTES },
{ _( "No Connect Symbol" ), LAYER_NOCONNECT },
{ wxT( "" ), -1 } // Sentinel marking end of list.
};
static ColorButton ComponentColorButtons[] = {
{ _( "Body" ), LAYER_DEVICE },
{ _( "Body background" ), LAYER_DEVICE_BACKGROUND },
{ _( "Pin" ), LAYER_PIN },
{ _( "Pin number" ), LAYER_PINNUM },
{ _( "Pin name" ), LAYER_PINNAM },
{ _( "Reference" ), LAYER_REFERENCEPART },
{ _( "Value" ), LAYER_VALUEPART },
{ _( "Fields" ), LAYER_FIELDS },
static COLORBUTTON componentColorButtons[] = {
{ _( "Body" ), LAYER_DEVICE },
{ _( "Body background" ), LAYER_DEVICE_BACKGROUND },
{ _( "Pin" ), LAYER_PIN },
{ _( "Pin number" ), LAYER_PINNUM },
{ _( "Pin name" ), LAYER_PINNAM },
{ _( "Reference" ), LAYER_REFERENCEPART },
{ _( "Value" ), LAYER_VALUEPART },
{ _( "Fields" ), LAYER_FIELDS },
{ wxT( "" ), -1 } // Sentinel marking end of list.
};
static ColorButton SheetColorButtons[] = {
{ _( "Sheet" ), LAYER_SHEET },
{ _( "Sheet file name" ), LAYER_SHEETFILENAME },
{ _( "Sheet name" ), LAYER_SHEETNAME },
{ _( "Sheet label" ), LAYER_SHEETLABEL },
{ _( "Hierarchical label" ), LAYER_HIERLABEL },
static COLORBUTTON sheetColorButtons[] = {
{ _( "Sheet" ), LAYER_SHEET },
{ _( "Sheet file name" ), LAYER_SHEETFILENAME },
{ _( "Sheet name" ), LAYER_SHEETNAME },
{ _( "Sheet label" ), LAYER_SHEETLABEL },
{ _( "Hierarchical label" ),LAYER_HIERLABEL },
{ wxT( "" ), -1 } // Sentinel marking end of list.
};
static ColorButton MiscColorButtons[] = {
{ _( "Erc warning" ), LAYER_ERC_WARN },
{ _( "Erc error" ), LAYER_ERC_ERR },
{ _( "Grid" ), LAYER_GRID },
static COLORBUTTON miscColorButtons[] = {
{ _( "Erc warning" ), LAYER_ERC_WARN },
{ _( "Erc error" ), LAYER_ERC_ERR },
{ _( "Grid" ), LAYER_GRID },
{ wxT( "" ), -1 } // Sentinel marking end of list.
};
static ButtonIndex buttonGroups[] = {
{ _( "General" ), GeneralColorButtons },
{ _( "Component" ), ComponentColorButtons },
{ _( "Sheet" ), SheetColorButtons },
{ _( "Miscellaneous" ), MiscColorButtons },
static BUTTONINDEX buttonGroups[] = {
{ _( "General" ), generalColorButtons },
{ _( "Component" ), componentColorButtons },
{ _( "Sheet" ), sheetColorButtons },
{ _( "Miscellaneous" ), miscColorButtons },
{ wxT( "" ), NULL }
};
......@@ -81,7 +101,7 @@ DIALOG_COLOR_CONFIG::DIALOG_COLOR_CONFIG()
DIALOG_COLOR_CONFIG::DIALOG_COLOR_CONFIG( EDA_DRAW_FRAME* aParent )
{
m_Parent = aParent;
m_parent = aParent;
Init();
Create( aParent );
}
......@@ -115,38 +135,39 @@ bool DIALOG_COLOR_CONFIG::Create( wxWindow* aParent,
void DIALOG_COLOR_CONFIG::Init()
{
OuterBoxSizer = NULL;
MainBoxSizer = NULL;
ColumnBoxSizer = NULL;
RowBoxSizer = NULL;
BitmapButton = NULL;
m_outerBoxSizer = NULL;
m_mainBoxSizer = NULL;
m_columnBoxSizer = NULL;
m_rowBoxSizer = NULL;
m_bitmapButton = NULL;
m_SelBgColor = NULL;
Line = NULL;
StdDialogButtonSizer = NULL;
Button = NULL;
m_line = NULL;
m_stdDialogButtonSizer = NULL;
}
void DIALOG_COLOR_CONFIG::CreateControls()
{
wxStaticText* label;
int buttonId = 1800;
ButtonIndex* groups = buttonGroups;
wxButton* button;
wxStaticText* label;
int buttonId = 1800;
OuterBoxSizer = new wxBoxSizer( wxVERTICAL );
SetSizer( OuterBoxSizer );
BUTTONINDEX* groups = buttonGroups;
MainBoxSizer = new wxBoxSizer( wxHORIZONTAL );
OuterBoxSizer->Add( MainBoxSizer, 1, wxGROW | wxLEFT | wxRIGHT, 5 );
m_outerBoxSizer = new wxBoxSizer( wxVERTICAL );
SetSizer( m_outerBoxSizer );
m_mainBoxSizer = new wxBoxSizer( wxHORIZONTAL );
m_outerBoxSizer->Add( m_mainBoxSizer, 1, wxGROW | wxLEFT | wxRIGHT, 5 );
while( groups->m_Buttons != NULL )
{
ColorButton* buttons = groups->m_Buttons;
COLORBUTTON* buttons = groups->m_Buttons;
ColumnBoxSizer = new wxBoxSizer( wxVERTICAL );
MainBoxSizer->Add( ColumnBoxSizer, 1, wxALIGN_TOP | wxLEFT | wxTOP, 5 );
RowBoxSizer = new wxBoxSizer( wxHORIZONTAL );
ColumnBoxSizer->Add( RowBoxSizer, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
m_columnBoxSizer = new wxBoxSizer( wxVERTICAL );
m_mainBoxSizer->Add( m_columnBoxSizer, 1, wxALIGN_TOP | wxLEFT | wxTOP, 5 );
m_rowBoxSizer = new wxBoxSizer( wxHORIZONTAL );
m_columnBoxSizer->Add( m_rowBoxSizer, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
// Add a text string to identify the column of color select buttons.
label = new wxStaticText( this, wxID_ANY, groups->m_Name );
......@@ -156,34 +177,43 @@ void DIALOG_COLOR_CONFIG::CreateControls()
font.SetWeight( wxFONTWEIGHT_BOLD );
label->SetFont( font );
RowBoxSizer->Add( label, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
m_rowBoxSizer->Add( label, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
while( buttons->m_Layer >= 0 )
{
RowBoxSizer = new wxBoxSizer( wxHORIZONTAL );
ColumnBoxSizer->Add( RowBoxSizer, 0, wxGROW | wxALL, 0 );
m_rowBoxSizer = new wxBoxSizer( wxHORIZONTAL );
m_columnBoxSizer->Add( m_rowBoxSizer, 0, wxGROW | wxALL, 0 );
wxMemoryDC iconDC;
wxBitmap bitmap( BUTT_SIZE_X, BUTT_SIZE_Y );
iconDC.SelectObject( bitmap );
EDA_COLOR_T color = GetLayerColor( LayerNumber( buttons->m_Layer ) );
currentColors[ buttons->m_Layer ] = color;
iconDC.SetPen( *wxBLACK_PEN );
wxBrush brush;
ColorSetBrush( &brush, color );
#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
#else
brush.SetStyle( wxSOLID );
#endif
iconDC.SetBrush( brush );
iconDC.DrawRectangle( 0, 0, BUTT_SIZE_X, BUTT_SIZE_Y );
BitmapButton = new wxBitmapButton( this, buttonId, bitmap, wxDefaultPosition,
m_bitmapButton = new wxBitmapButton( this, buttonId, bitmap, wxDefaultPosition,
wxSize( BUTT_SIZE_X+8, BUTT_SIZE_Y+6 ) );
BitmapButton->SetClientData( (void*) buttons );
RowBoxSizer->Add( BitmapButton, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxBOTTOM, 5 );
m_bitmapButton->SetClientData( (void*) buttons );
m_rowBoxSizer->Add( m_bitmapButton, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxBOTTOM, 5 );
label = new wxStaticText( this, wxID_ANY, wxGetTranslation( buttons->m_Name ) );
RowBoxSizer->Add( label, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxBOTTOM, 5 );
m_rowBoxSizer->Add( label, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxBOTTOM, 5 );
buttonId += 1;
buttons++;
}
......@@ -195,7 +225,7 @@ void DIALOG_COLOR_CONFIG::CreateControls()
wxCommandEventHandler( DIALOG_COLOR_CONFIG::SetColor ) );
// Add a spacer to improve appearance.
ColumnBoxSizer->AddSpacer( 5 );
m_columnBoxSizer->AddSpacer( 5 );
wxArrayString m_SelBgColorStrings;
m_SelBgColorStrings.Add( _( "White" ) );
......@@ -204,30 +234,31 @@ void DIALOG_COLOR_CONFIG::CreateControls()
wxDefaultPosition, wxDefaultSize,
m_SelBgColorStrings, 1, wxRA_SPECIFY_COLS );
m_SelBgColor->SetSelection( ( g_DrawBgColor == BLACK ) ? 1 : 0 );
ColumnBoxSizer->Add( m_SelBgColor, 1, wxGROW | wxRIGHT | wxTOP | wxBOTTOM, 5 );
m_columnBoxSizer->Add( m_SelBgColor, 1, wxGROW | wxRIGHT | wxTOP | wxBOTTOM, 5 );
// Provide a line to separate all of the controls added so far from the
// "OK", "Cancel", and "Apply" buttons (which will be added after that
// line).
Line = new wxStaticLine( this, -1, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
OuterBoxSizer->Add( Line, 0, wxGROW | wxALL, 5 );
m_line = new wxStaticLine( this, -1, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
m_outerBoxSizer->Add( m_line, 0, wxGROW | wxALL, 5 );
// Provide a StdDialogButtonSizer to accommodate the OK, Cancel, and Apply
// buttons; using that type of sizer results in those buttons being
// automatically located in positions appropriate for each (OS) version of
// KiCad.
StdDialogButtonSizer = new wxStdDialogButtonSizer;
OuterBoxSizer->Add( StdDialogButtonSizer, 0, wxGROW | wxALL, 10 );
m_stdDialogButtonSizer = new wxStdDialogButtonSizer;
m_outerBoxSizer->Add( m_stdDialogButtonSizer, 0, wxGROW | wxALL, 10 );
button = new wxButton( this, wxID_OK, _( "OK" ), wxDefaultPosition, wxDefaultSize, 0 );
m_stdDialogButtonSizer->AddButton( button );
Button = new wxButton( this, wxID_OK, _( "OK" ), wxDefaultPosition, wxDefaultSize, 0 );
StdDialogButtonSizer->AddButton( Button );
button = new wxButton( this, wxID_CANCEL, _( "Cancel" ), wxDefaultPosition, wxDefaultSize, 0 );
m_stdDialogButtonSizer->AddButton( button );
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ), wxDefaultPosition, wxDefaultSize, 0 );
StdDialogButtonSizer->AddButton( Button );
Button->SetFocus();
button->SetFocus();
Button = new wxButton( this, wxID_APPLY, _( "Apply" ), wxDefaultPosition, wxDefaultSize, 0 );
StdDialogButtonSizer->AddButton( Button );
button = new wxButton( this, wxID_APPLY, _( "Apply" ), wxDefaultPosition, wxDefaultSize, 0 );
m_stdDialogButtonSizer->AddButton( button );
Connect( wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED,
wxCommandEventHandler( DIALOG_COLOR_CONFIG::OnOkClick ) );
......@@ -236,7 +267,7 @@ void DIALOG_COLOR_CONFIG::CreateControls()
Connect( wxID_APPLY, wxEVT_COMMAND_BUTTON_CLICKED,
wxCommandEventHandler( DIALOG_COLOR_CONFIG::OnApplyClick ) );
StdDialogButtonSizer->Realize();
m_stdDialogButtonSizer->Realize();
// Dialog now needs to be resized, but the associated command is found elsewhere.
}
......@@ -248,7 +279,7 @@ void DIALOG_COLOR_CONFIG::SetColor( wxCommandEvent& event )
wxCHECK_RET( button != NULL, wxT( "Color button event object is NULL." ) );
ColorButton* colorButton = (ColorButton*) button->GetClientData();
COLORBUTTON* colorButton = (COLORBUTTON*) button->GetClientData();
wxCHECK_RET( colorButton != NULL, wxT( "Client data not set for color button." ) );
......@@ -263,10 +294,17 @@ void DIALOG_COLOR_CONFIG::SetColor( wxCommandEvent& event )
wxBitmap bitmap = button->GetBitmapLabel();
iconDC.SelectObject( bitmap );
wxBrush brush;
iconDC.SetPen( *wxBLACK_PEN );
wxBrush brush;
ColorSetBrush( &brush, color);
#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
#else
brush.SetStyle( wxSOLID );
#endif
iconDC.SetBrush( brush );
iconDC.DrawRectangle( 0, 0, BUTT_SIZE_X, BUTT_SIZE_Y );
......@@ -295,7 +333,7 @@ bool DIALOG_COLOR_CONFIG::UpdateColorsSettings()
warning = true;
}
m_Parent->SetGridColor( GetLayerColor( LAYER_GRID ) );
m_parent->SetGridColor( GetLayerColor( LAYER_GRID ) );
if( g_DrawBgColor == GetLayerColor( LAYER_GRID ) )
warning = true;
......@@ -313,7 +351,7 @@ void DIALOG_COLOR_CONFIG::OnOkClick( wxCommandEvent& event )
if( warning )
wxMessageBox( _("Warning:\nSome items have the same color as the background\nand they will not be seen on screen") );
m_Parent->GetCanvas()->Refresh();
m_parent->GetCanvas()->Refresh();
EndModal( 1 );
}
......@@ -328,5 +366,5 @@ void DIALOG_COLOR_CONFIG::OnCancelClick( wxCommandEvent& event )
void DIALOG_COLOR_CONFIG::OnApplyClick( wxCommandEvent& event )
{
UpdateColorsSettings();
m_Parent->GetCanvas()->Refresh();
m_parent->GetCanvas()->Refresh();
}
eeschema/dialogs/dialog_color_config.h
View file @ 1c0f034b
#ifndef _DIALOG_COLOR_CONFIG_H_
#define _DIALOG_COLOR_CONFIG_H_
#ifndef DIALOG_COLOR_CONFIG_H_
#define DIALOG_COLOR_CONFIG_H_
#include <wx/statline.h>
......@@ -13,47 +13,24 @@ class wxStdDialogButtonSizer;
extern void SeedLayers();
// Specify the width and height of every (color-displaying / bitmap) button
const int BUTT_SIZE_X = 16;
const int BUTT_SIZE_Y = 16;
/********************/
/* Layer menu list. */
/********************/
struct ColorButton
{
wxString m_Name;
int m_Layer;
};
struct ButtonIndex
{
wxString m_Name;
ColorButton* m_Buttons;
};
/***********************************************/
/* Derived class for the frame color settings. */
/***********************************************/
class DIALOG_COLOR_CONFIG: public wxDialog
class DIALOG_COLOR_CONFIG : public wxDialog
{
private:
DECLARE_DYNAMIC_CLASS( DIALOG_COLOR_CONFIG )
EDA_DRAW_FRAME* m_Parent;
wxBoxSizer* OuterBoxSizer;
wxBoxSizer* MainBoxSizer;
wxBoxSizer* ColumnBoxSizer;
wxBoxSizer* RowBoxSizer;
wxBitmapButton* BitmapButton;
EDA_DRAW_FRAME* m_parent;
wxBoxSizer* m_outerBoxSizer;
wxBoxSizer* m_mainBoxSizer;
wxBoxSizer* m_columnBoxSizer;
wxBoxSizer* m_rowBoxSizer;
wxBitmapButton* m_bitmapButton;
wxRadioBox* m_SelBgColor;
wxStaticLine* Line;
wxStdDialogButtonSizer* StdDialogButtonSizer;
wxButton* Button;
wxStaticLine* m_line;
wxStdDialogButtonSizer* m_stdDialogButtonSizer;
// Creation
bool Create( wxWindow* aParent,
......@@ -70,7 +47,7 @@ private:
void CreateControls();
wxBitmap GetBitmapResource( const wxString& aName );
wxIcon GetIconResource( const wxString& aName );
wxIcon GetIconResource( const wxString& aName );
static bool ShowToolTips();
bool UpdateColorsSettings();
......@@ -86,4 +63,4 @@ public:
~DIALOG_COLOR_CONFIG();
};
#endif // _DIALOG_COLOR_CONFIG_H_
#endif // DIALOG_COLOR_CONFIG_H_
gerbview/draw_gerber_screen.cpp
View file @ 1c0f034b
......@@ -137,7 +137,12 @@ void GBR_LAYOUT::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDrawMode,
// artifacts can happen with negative items or negative images
wxColour bgColor = MakeColour( g_DrawBgColor );
#if wxCHECK_VERSION( 3, 0, 0 )
wxBrush bgBrush( bgColor, wxBRUSHSTYLE_SOLID );
#else
wxBrush bgBrush( bgColor, wxSOLID );
#endif
GERBVIEW_FRAME* gerbFrame = (GERBVIEW_FRAME*) aPanel->GetParent();
......
include/xnode.h
View file @ 1c0f034b
......@@ -34,8 +34,8 @@
#include <wx/xml/xml.h>
#if wxCHECK_VERSION( 2, 9, 0 )
#define wxXmlProperty wxXmlAttribute
#if !wxCHECK_VERSION( 2, 9, 0 )
#define wxXmlAttribute wxXmlProperty
#endif
/**
......@@ -58,7 +58,7 @@ public:
}
XNODE( XNODE* aParent, wxXmlNodeType aType, const wxString& aName,
const wxString& aContent = wxEmptyString, wxXmlProperty* aProperties = NULL ) :
const wxString& aContent = wxEmptyString, wxXmlAttribute* aProperties = NULL ) :
wxXmlNode( aParent, aType, aName, aContent, aProperties )
{
}
......@@ -120,7 +120,7 @@ public:
{
return DeleteProperty( attrName );
}
wxXmlProperty* GetAttributes() const
wxXmlAttribute* GetAttributes() const
{
return GetProperties();
}
......
pcbnew/dialogs/dialog_copper_zones.cpp
View file @ 1c0f034b
......@@ -694,7 +694,13 @@ wxBitmap DIALOG_COPPER_ZONE::makeLayerBitmap( EDA_COLOR_T aColor )
iconDC.SelectObject( bitmap );
brush.SetColour( MakeColour( aColor ) );
#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
#else
brush.SetStyle( wxSOLID );
#endif
iconDC.SetBrush( brush );
iconDC.DrawRectangle( 0, 0, LAYER_BITMAP_SIZE_X, LAYER_BITMAP_SIZE_Y );
......
pcbnew/dialogs/dialog_keepout_area_properties.cpp
View file @ 1c0f034b
......@@ -260,7 +260,13 @@ wxBitmap DIALOG_KEEPOUT_AREA_PROPERTIES::makeLayerBitmap( EDA_COLOR_T aColor )
iconDC.SelectObject( bitmap );
brush.SetColour( MakeColour( aColor ) );
#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
#else
brush.SetStyle( wxSOLID );
#endif
iconDC.SetBrush( brush );
iconDC.DrawRectangle( 0, 0, LAYER_BITMAP_SIZE_X, LAYER_BITMAP_SIZE_Y );
......
pcbnew/footprint_wizard_frame.cpp
View file @ 1c0f034b
......@@ -80,8 +80,16 @@ EVT_TOOL( ID_FOOTPRINT_WIZARD_SHOW_3D_VIEW,
// listbox events
EVT_LISTBOX( ID_FOOTPRINT_WIZARD_PAGE_LIST, FOOTPRINT_WIZARD_FRAME::ClickOnPageList )
#if wxCHECK_VERSION( 3, 0, 0 )
EVT_GRID_CMD_CELL_CHANGED( ID_FOOTPRINT_WIZARD_PARAMETER_LIST,
FOOTPRINT_WIZARD_FRAME::ParametersUpdated )
#else
EVT_GRID_CMD_CELL_CHANGE( ID_FOOTPRINT_WIZARD_PARAMETER_LIST,
FOOTPRINT_WIZARD_FRAME::ParametersUpdated )
#endif
EVT_GRID_CMD_EDITOR_HIDDEN( ID_FOOTPRINT_WIZARD_PARAMETER_LIST,
FOOTPRINT_WIZARD_FRAME::ParametersUpdated )
......
pcbnew/layer_widget.cpp
View file @ 1c0f034b
......@@ -192,7 +192,13 @@ wxBitmap LAYER_WIDGET::makeBitmap( EDA_COLOR_T aColor )
iconDC.SelectObject( bitmap );
brush.SetColour( MakeColour( aColor ) );
#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
#else
brush.SetStyle( wxSOLID );
#endif
iconDC.SetBrush( brush );
iconDC.DrawRectangle( 0, 0, BUTT_SIZE_X - 2 * BUTT_VOID, BUTT_SIZE_Y - 2 * BUTT_VOID );
......
pcbnew/pcbnew_config.cpp
View file @ 1c0f034b
......@@ -495,7 +495,7 @@ PARAM_CFG_ARRAY& PCB_EDIT_FRAME::GetConfigurationSettings()
void PCB_EDIT_FRAME::SaveMacros()
{
wxXmlDocument xml;
wxXmlProperty *macrosProp, *hkProp, *xProp, *yProp;
wxXmlAttribute *macrosProp, *hkProp, *xProp, *yProp;
wxString str, hkStr, xStr, yStr;
wxFileName fn = GetBoard()->GetFileName();
......@@ -513,7 +513,7 @@ void PCB_EDIT_FRAME::SaveMacros()
for( int number = 9; number >= 0; number-- )
{
str.Printf( wxT( "%d" ), number );
macrosProp = new wxXmlProperty( wxT( "number" ), str );
macrosProp = new wxXmlAttribute( wxT( "number" ), str );
XNODE * macrosNode = new XNODE( rootNode, wxXML_ELEMENT_NODE,
wxT( "macros" ), wxEmptyString,
......@@ -527,9 +527,9 @@ void PCB_EDIT_FRAME::SaveMacros()
xStr.Printf( wxT( "%d" ), i->m_Position.x );
yStr.Printf( wxT( "%d" ), i->m_Position.y );
yProp = new wxXmlProperty( wxT( "y" ), yStr );
xProp = new wxXmlProperty( wxT( "x" ), xStr, yProp );
hkProp = new wxXmlProperty( wxT( "hkcode" ), hkStr, xProp );
yProp = new wxXmlAttribute( wxT( "y" ), yStr );
xProp = new wxXmlAttribute( wxT( "x" ), xStr, yProp );
hkProp = new wxXmlAttribute( wxT( "hkcode" ), hkStr, xProp );
new XNODE( macrosNode, wxXML_ELEMENT_NODE, wxT( "hotkey" ),
wxEmptyString, hkProp );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment