Very minor fixes: fix some warnings in Debug mode.

cvpcb/readschematicnetlist.cpp

@@ -200,8 +200,8 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist()
         ptchar = strstr( (char*) &Line[idx], " " );  // Search end of value field (space)
         if( ptchar == 0 )
         {
-            wxString msg;
-            msg.Printf( _( "Netlist error: %s" ), (const wxChar*) CONV_FROM_UTF8( Line ) );
+            wxString msg = _( "Netlist error: " );
+            msg << CONV_FROM_UTF8( Line );
             DisplayError( this, msg );
             k = 0;
         }

eeschema/dialogs/dialog_eeschema_options_base.cpp

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Sep  8 2010)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -124,23 +124,18 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
 	bSizer2 = new wxBoxSizer( wxVERTICAL );
 	
 	m_checkShowGrid = new wxCheckBox( m_panel1, wxID_ANY, _("Show g&rid"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	bSizer2->Add( m_checkShowGrid, 0, wxALL|wxEXPAND, 3 );
 	
 	m_checkShowHiddenPins = new wxCheckBox( m_panel1, wxID_ANY, _("Show hi&dden pins"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	bSizer2->Add( m_checkShowHiddenPins, 0, wxALL|wxEXPAND, 3 );
 	
 	m_checkAutoPan = new wxCheckBox( m_panel1, wxID_ANY, _("Enable automatic &panning"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	bSizer2->Add( m_checkAutoPan, 0, wxALL|wxEXPAND, 3 );
 	
 	m_checkHVOrientation = new wxCheckBox( m_panel1, wxID_ANY, _("Allow buses and wires to be placed in H or V &orientation only"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	bSizer2->Add( m_checkHVOrientation, 0, wxALL|wxEXPAND, 3 );
 	
 	m_checkPageLimits = new wxCheckBox( m_panel1, wxID_ANY, _("Show p&age limits"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 );
 	
 	bSizer3->Add( bSizer2, 0, wxEXPAND, 0 );
@@ -173,7 +168,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
 	bSizer7 = new wxBoxSizer( wxVERTICAL );
 	
 	wxFlexGridSizer* fgSizer2;
-	fgSizer2 = new wxFlexGridSizer( 2, 2, 0, 0 );
+	fgSizer2 = new wxFlexGridSizer( 8, 2, 0, 0 );
 	fgSizer2->AddGrowableCol( 1 );
 	fgSizer2->SetFlexibleDirection( wxHORIZONTAL );
 	fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

eeschema/dialogs/dialog_eeschema_options_base.h

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Sep  8 2010)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -96,10 +96,11 @@ class DIALOG_EESCHEMA_OPTIONS_BASE : public wxDialog
 		wxButton* m_sdbSizer1Cancel;
 		
 		// Virtual event handlers, overide them in your derived class
-		virtual void OnChooseUnits( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnChooseUnits( wxCommandEvent& event ) { event.Skip(); }
 		
 	
 	public:
+		
 		DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~DIALOG_EESCHEMA_OPTIONS_BASE();
 	

eeschema/sch_text.cpp

@@ -478,7 +478,6 @@ bool SCH_TEXT::Load( LINE_READER& aLine, wxString& aErrorMsg )
     }
 
     wxString val = CONV_FROM_UTF8( text );
-
     for( ;; )
     {
         int i = val.find( wxT( "\\n" ) );

gerbview/edit.cpp

@@ -112,7 +112,7 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event )
         break;
 
     default:
-        DrawPanel->UnManageCursor( 0, 0, wxEmptyString );
+        DrawPanel->UnManageCursor( );
         break;
     }
 

include/macros.h

@@ -7,11 +7,16 @@
 
 #include <wx/wx.h>
 
-
+// Note: we should use wxConvUTF8 insdeat of wxConvCurrent here,
+// in order to use UTF8 in Kicad files.
+// But this change break compatibility with older files under Windows,
+// if some non ASCII characters are found in strings.
+// So this is a TODO change.
 #if wxUSE_UNICODE
 #define CONV_TO_UTF8( wxstring )     ( (const char*) wxConvCurrent->cWX2MB( wxstring ) )
 #define CONV_FROM_UTF8( utf8string ) ( wxConvCurrent->cMB2WC( utf8string ) )
 #else
+// Should not used: Kicad uses Unicode verion on wxWidgets
 #define CONV_TO_UTF8( wxstring )     ( (const char*) ( (wxstring).c_str() ) )
 #define CONV_FROM_UTF8( utf8string ) (utf8string)
 #endif

pcbnew/dialogs/dialog_design_rules_base.cpp

@@ -153,7 +153,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
 	m_panelNetClassesEditor->SetSizer( bpanelNetClassesSizer );
 	m_panelNetClassesEditor->Layout();
 	bpanelNetClassesSizer->Fit( m_panelNetClassesEditor );
-	m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), false );
+	m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), true );
 	m_panelGolbalDesignRules = new wxPanel( m_DRnotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
 	wxBoxSizer* bpanelGlobRulesSizer;
 	bpanelGlobRulesSizer = new wxBoxSizer( wxVERTICAL );
@@ -173,7 +173,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
 	sbViasOptionSizer->Add( m_OptViaType, 0, wxALL|wxEXPAND, 5 );
 	
 	wxFlexGridSizer* fgViasMinValuesSizer;
-	fgViasMinValuesSizer = new wxFlexGridSizer( 1, 2, 0, 0 );
+	fgViasMinValuesSizer = new wxFlexGridSizer( 2, 2, 0, 0 );
 	fgViasMinValuesSizer->AddGrowableCol( 1 );
 	fgViasMinValuesSizer->SetFlexibleDirection( wxBOTH );
 	fgViasMinValuesSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -208,7 +208,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
 	sbuViasSizer->Add( m_AllowMicroViaCtrl, 0, wxALL|wxEXPAND, 5 );
 	
 	wxFlexGridSizer* fgMinMicroviasValuesSizer;
-	fgMinMicroviasValuesSizer = new wxFlexGridSizer( 1, 2, 0, 0 );
+	fgMinMicroviasValuesSizer = new wxFlexGridSizer( 2, 2, 0, 0 );
 	fgMinMicroviasValuesSizer->AddGrowableCol( 1 );
 	fgMinMicroviasValuesSizer->SetFlexibleDirection( wxBOTH );
 	fgMinMicroviasValuesSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -357,7 +357,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
 	m_panelGolbalDesignRules->SetSizer( bpanelGlobRulesSizer );
 	m_panelGolbalDesignRules->Layout();
 	bpanelGlobRulesSizer->Fit( m_panelGolbalDesignRules );
-	m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), true );
+	m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), false );
 	
 	bMainSizer->Add( m_DRnotebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 	

pcbnew/dialogs/dialog_design_rules_base.fbp

@@ -142,7 +142,7 @@
                         <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">Net Classes Editor</property>
-                            <property name="select">0</property>
+                            <property name="select">1</property>
                             <object class="wxPanel" expanded="1">
                                 <property name="bg"></property>
                                 <property name="context_help"></property>
@@ -1048,7 +1048,7 @@
                         <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">Global Design Rules</property>
-                            <property name="select">1</property>
+                            <property name="select">0</property>
                             <object class="wxPanel" expanded="1">
                                 <property name="bg"></property>
                                 <property name="context_help"></property>
@@ -1195,7 +1195,7 @@
                                                             <property name="name">fgViasMinValuesSizer</property>
                                                             <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                                             <property name="permission">none</property>
-                                                            <property name="rows">1</property>
+                                                            <property name="rows">2</property>
                                                             <property name="vgap">0</property>
                                                             <object class="sizeritem" expanded="1">
                                                                 <property name="border">5</property>
@@ -1518,7 +1518,7 @@
                                                             <property name="name">fgMinMicroviasValuesSizer</property>
                                                             <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                                             <property name="permission">none</property>
-                                                            <property name="rows">1</property>
+                                                            <property name="rows">2</property>
                                                             <property name="vgap">0</property>
                                                             <object class="sizeritem" expanded="1">
                                                                 <property name="border">5</property>

pcbnew/pcbnew.h

@@ -5,7 +5,6 @@
 #define PCBNEW_H
 
 #include "pcbstruct.h"
-#include "macros.h"
 #include "pcbcommon.h"
 #include "class_board_design_settings.h"