wxDefaultSize.* and wxDefaultPosition.* to wxDefaultCoord.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
index ab8f612f77ded8f803aafadca802e6ea139c44ec..f38e0ee9bd94cda3187fe88e25d0db7aebfdf67c 100644 (file)
--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -166,7 +166,7 @@ public:
     // See the documentation for wxToolBar for details.
 
     virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
     // See the documentation for wxToolBar for details.
 
     virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,

-               const bool toggle = false, const long xPos = wxDefaultPosition.x, const long yPos = wxDefaultPosition.y, wxObject *clientData = NULL,
+               const bool toggle = false, const long xPos = wxDefaultCoord, const long yPos = wxDefaultCoord, wxObject *clientData = NULL,

                const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
 
         // Adds a separator. See the documentation for wxToolBar for details.
                const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
 
         // Adds a separator. See the documentation for wxToolBar for details.

diff --git a/contrib/samples/deprecated/proplist/proplist.cpp b/contrib/samples/deprecated/proplist/proplist.cpp
index 37b931a031ed7ea677da96a506bcf99f035298d6..ea5e4e9931c39e4b5711a0e0fdc96efcfcb06179 100644 (file)
--- a/contrib/samples/deprecated/proplist/proplist.cpp
+++ b/contrib/samples/deprecated/proplist/proplist.cpp
@@ -307,7 +307,7 @@ void MyApp::PropertyFormTest(bool useDialog)
 
     // The name of this text item matches the "fred" property
     wxTextCtrl *text = new wxTextCtrl(panel, wxID_ANY, _T("Fred"), wxDefaultPosition,
 
     // The name of this text item matches the "fred" property
     wxTextCtrl *text = new wxTextCtrl(panel, wxID_ANY, _T("Fred"), wxDefaultPosition,

-        wxSize( 200, wxDefaultSize.y), 0, wxDefaultValidator, _T("fred"));
+        wxSize( 200, wxDefaultCoord), 0, wxDefaultValidator, _T("fred"));

 
     c = new wxLayoutConstraints;
     c->left.SameAs(panel, wxLeft, 4);
 
     c = new wxLayoutConstraints;
     c->left.SameAs(panel, wxLeft, 4);

diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
index 6d71ad5239c319b1519272021c50e58c3775dbe0..b39015d01fa4d502ae0d64a41572bf705fae96e2 100644 (file)
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -284,7 +284,7 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
 
     // Initialize main slider
     m_positionSlider = new wxSlider( m_panel, MMBoard_PositionSlider, 0, 0, 60,
 
     // Initialize main slider
     m_positionSlider = new wxSlider( m_panel, MMBoard_PositionSlider, 0, 0, 60,

-                     wxDefaultPosition, wxSize(300, wxDefaultSize.y),
+                     wxDefaultPosition, wxSize(300, wxDefaultCoord),

                      wxSL_HORIZONTAL | wxSL_AUTOTICKS);
     m_positionSlider->SetPageSize(60);  // 60 secs
     m_positionSlider->Disable();
                      wxSL_HORIZONTAL | wxSL_AUTOTICKS);
     m_positionSlider->SetPageSize(60);  // 60 secs
     m_positionSlider->Disable();

diff --git a/contrib/samples/ogl/ogledit/palette.cpp b/contrib/samples/ogl/ogledit/palette.cpp
index 2f6d39c4cf7e0062e8cbd633412d2d153b4313c5..1449340569cdce7514b07a4dd0168203db4cbbbc 100644 (file)
--- a/contrib/samples/ogl/ogledit/palette.cpp
+++ b/contrib/samples/ogl/ogledit/palette.cpp
@@ -102,11 +102,11 @@ EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
   palette->SetMargins(2, 2);
   palette->SetToolBitmapSize(wxSize(22, 22));
 
   palette->SetMargins(2, 2);
   palette->SetToolBitmapSize(wxSize(22, 22));
 

-  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Pointer"));
-  palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 1"));
-  palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 2"));
-  palette->AddTool(PALETTE_TOOL3, PaletteTool3, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 3"));
-  palette->AddTool(PALETTE_TOOL4, PaletteTool4, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 4"));
+  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Pointer"));
+  palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 1"));
+  palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 2"));
+  palette->AddTool(PALETTE_TOOL3, PaletteTool3, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 3"));
+  palette->AddTool(PALETTE_TOOL4, PaletteTool4, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 4"));

 
   palette->Realize();
 
 
   palette->Realize();
 

diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp
index 719afbfff5963aa3f7e7fb2d7a36b70d130e9bd4..7fda08634fb51bf264071c732b468f691fa5efbc 100644 (file)
--- a/contrib/samples/ogl/studio/cspalette.cpp
+++ b/contrib/samples/ogl/studio/cspalette.cpp
@@ -134,8 +134,8 @@ bool csApp::CreatePalette(wxFrame *parent)
 
   palette->SetToolBitmapSize(toolBitmapSize);
 
 
   palette->SetToolBitmapSize(toolBitmapSize);
 

-  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Pointer"));
-  palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Text"));
+  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Pointer"));
+  palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Text"));

 
   wxChar** symbols = new wxChar*[20];
   int noSymbols = 0;
 
   wxChar** symbols = new wxChar*[20];
   int noSymbols = 0;


@@ -175,7 +175,7 @@ bool csApp::CreatePalette(wxFrame *parent)
       if (symbol)
       {
            wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
       if (symbol)
       {
            wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);

-           palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, symbol->GetName());
+           palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultCoord, NULL, symbol->GetName());

 
            delete bitmap;
       }
 
            delete bitmap;
       }


@@ -189,7 +189,7 @@ bool csApp::CreatePalette(wxFrame *parent)
     csSymbol* symbol = (csSymbol*) node->Data();
 
     wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
     csSymbol* symbol = (csSymbol*) node->Data();
 
     wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);

-    palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, symbol->GetName());
+    palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultCoord, NULL, symbol->GetName());

 
     delete bitmap;
 
 
     delete bitmap;
 

diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp
index 492f1ad4908791ffe2921889923a9a7a43c057e7..bbb4af14d5fd555b483be841d92fddca61838bf5 100644 (file)
--- a/contrib/samples/ogl/studio/studio.cpp
+++ b/contrib/samples/ogl/studio/studio.cpp
@@ -347,20 +347,20 @@ void csApp::InitToolBar(wxToolBar* toolBar)
 #error "Not implemented for this platform."
 #endif
 
 #error "Not implemented for this platform."
 #endif
 

-  toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("New file"));
-  toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Open file"));
-  toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Save file"));
+  toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("New file"));
+  toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Open file"));
+  toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Save file"));

   toolBar->AddSeparator();
   toolBar->AddSeparator();

-  toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Print"));
+  toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Print"));

   toolBar->AddSeparator();
   toolBar->AddSeparator();

-  toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Copy"));
-  toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Cut"));
-  toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Paste"));
+  toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Copy"));
+  toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Cut"));
+  toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Paste"));

   toolBar->AddSeparator();
   toolBar->AddSeparator();

-  toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Undo"));
-  toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Redo"));
+  toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Undo"));
+  toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Redo"));

   toolBar->AddSeparator();
   toolBar->AddSeparator();

-  toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Help"));
+  toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Help"));

 
   toolBar->Realize();
 
 
   toolBar->Realize();
 


@@ -421,18 +421,18 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
 #error "Not implemented for this platform."
 #endif
 
 #error "Not implemented for this platform."
 #endif
 

-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNL, *bitmaps[0], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align left"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNR, *bitmaps[1], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align right"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNT, *bitmaps[2], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align top"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNB, *bitmaps[3], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align bottom"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_HORIZ, *bitmaps[4], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align horizontally"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_VERT, *bitmaps[5], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align vertically"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_COPY_SIZE, *bitmaps[6], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Copy size"));
+    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNL, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align left"));
+    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNR, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align right"));
+    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNT, *bitmaps[2], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align top"));
+    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNB, *bitmaps[3], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align bottom"));
+    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_HORIZ, *bitmaps[4], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align horizontally"));
+    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_VERT, *bitmaps[5], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align vertically"));
+    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_COPY_SIZE, *bitmaps[6], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Copy size"));

     m_diagramToolBar->AddSeparator();
     m_diagramToolBar->AddSeparator();

-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_LINE_ARROW, *bitmaps[7], wxNullBitmap, true, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Toggle arrow"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_NEW_POINT, *bitmaps[8], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("New line point"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_CUT_POINT, *bitmaps[9], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Cut line point"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_STRAIGHTEN, *bitmaps[10], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Straighten lines"));
+    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_LINE_ARROW, *bitmaps[7], wxNullBitmap, true, wxDefaultCoord, wxDefaultCoord, NULL, _T("Toggle arrow"));
+    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_NEW_POINT, *bitmaps[8], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("New line point"));
+    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_CUT_POINT, *bitmaps[9], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Cut line point"));
+    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_STRAIGHTEN, *bitmaps[10], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Straighten lines"));

 
     m_diagramToolBar->Realize();
 
 
     m_diagramToolBar->Realize();
 

diff --git a/contrib/src/deprecated/proplist.cpp b/contrib/src/deprecated/proplist.cpp
index 10a3e9fa8f858d506009c8ee622191dcba92dada..8e1f435f546d5f3a21cae4be255f68c60093a18b 100644 (file)
--- a/contrib/src/deprecated/proplist.cpp
+++ b/contrib/src/deprecated/proplist.cpp
@@ -465,7 +465,7 @@ bool wxPropertyListView::CreateControls()
     }
 
     m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, wxEmptyString,
     }
 
     m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, wxEmptyString,

-       wxDefaultPosition, wxSize(wxDefaultSize.x, smallButtonSize.y), wxPROCESS_ENTER);
+       wxDefaultPosition, wxSize(wxDefaultCoord, smallButtonSize.y), wxPROCESS_ENTER);

     m_valueText->Disable();
     topsizer->Add( m_valueText, 1, wxALL | wxEXPAND, buttonborder );
 
     m_valueText->Disable();
     topsizer->Add( m_valueText, 1, wxALL | wxEXPAND, buttonborder );
 


@@ -482,7 +482,7 @@ bool wxPropertyListView::CreateControls()
 
     m_middleSizer = new wxBoxSizer( wxVERTICAL );
 
 
     m_middleSizer = new wxBoxSizer( wxVERTICAL );
 

-    m_valueList = new wxListBox(panel, wxID_PROP_VALUE_SELECT, wxDefaultPosition, wxSize(wxDefaultSize.x, 60));
+    m_valueList = new wxListBox(panel, wxID_PROP_VALUE_SELECT, wxDefaultPosition, wxSize(wxDefaultCoord, 60));

     m_valueList->Show(false);
 
     m_propertyScrollingList = new wxListBox(panel, wxID_PROP_SELECT, wxDefaultPosition, wxSize(100, 100));
     m_valueList->Show(false);
 
     m_propertyScrollingList = new wxListBox(panel, wxID_PROP_SELECT, wxDefaultPosition, wxSize(100, 100));


@@ -1656,7 +1656,7 @@ bool wxListOfStringsListValidator::EditStringList(wxWindow *parent, wxStringList
 
   dialog->m_stringText = new wxPropertyStringListEditorText(dialog,
        wxID_PROP_SL_TEXT, wxEmptyString, wxPoint(5, 240),
 
   dialog->m_stringText = new wxPropertyStringListEditorText(dialog,
        wxID_PROP_SL_TEXT, wxEmptyString, wxPoint(5, 240),

-       wxSize(300, wxDefaultSize.y), wxPROCESS_ENTER);
+       wxSize(300, wxDefaultCoord), wxPROCESS_ENTER);

   dialog->m_stringText->Disable();
 
   wxButton *addButton = new wxButton(dialog, wxID_PROP_SL_ADD, wxT("Add"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
   dialog->m_stringText->Disable();
 
   wxButton *addButton = new wxButton(dialog, wxID_PROP_SL_ADD, wxT("Add"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));

diff --git a/contrib/src/fl/newbmpbtn.cpp b/contrib/src/fl/newbmpbtn.cpp
index 672b6b386fe289ed248c17e4ea8f40dfcdd0e4bb..6de2cfbf1ed6bc096a36567b68fde8b978831581 100644 (file)
--- a/contrib/src/fl/newbmpbtn.cpp
+++ b/contrib/src/fl/newbmpbtn.cpp
@@ -520,7 +520,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
     if ( !mSizeIsSet && 0 )
     {
         mSizeIsSet = true;
     if ( !mSizeIsSet && 0 )
     {
         mSizeIsSet = true;

-        SetSize( wxDefaultPosition.x,wxDefaultPosition.y,
+        SetSize( wxDefaultCoord, wxDefaultCoord,

                  destBmp->GetWidth()  + mMarginX*2,
                  destBmp->GetHeight() + mMarginY*2, 0
             );
                  destBmp->GetWidth()  + mMarginX*2,
                  destBmp->GetHeight() + mMarginY*2, 0
             );

diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp
index 6c6d1069ba003b744f61d8b67b0d864fb68a0ce2..130ecd63eb38d32b3089cc15317bed990c3a7c13 100644 (file)
--- a/contrib/src/gizmos/multicell.cpp
+++ b/contrib/src/gizmos/multicell.cpp
@@ -314,8 +314,8 @@ void wxMultiCellSizer::RecalcSizes()
 
             c_size = rect->GetLocalSize();
             wxSize minSize( item->CalcMin() );
 
             c_size = rect->GetLocalSize();
             wxSize minSize( item->CalcMin() );

-            if (c_size.GetHeight() != wxDefaultSize.GetHeight() ||
-                c_size.GetWidth() != wxDefaultSize.GetWidth())
+            if (c_size.GetHeight() != wxDefaultCoord ||
+                c_size.GetWidth() != wxDefaultCoord)

             {
                 minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
                 minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));
             {
                 minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
                 minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));


@@ -454,8 +454,8 @@ void wxMultiCellSizer :: GetMinimums()
 
             wxSize minSize( item->CalcMin() );
             wxSize c_size = rect->GetLocalSize();
 
             wxSize minSize( item->CalcMin() );
             wxSize c_size = rect->GetLocalSize();

-            if (c_size.GetHeight() != wxDefaultSize.GetHeight() ||
-                c_size.GetWidth() != wxDefaultSize.GetWidth())
+            if (c_size.GetHeight() != wxDefaultCoord ||
+                c_size.GetWidth() != wxDefaultCoord)

             {
                 minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
                 minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));
             {
                 minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
                 minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));

diff --git a/contrib/src/gizmos/statpict.cpp b/contrib/src/gizmos/statpict.cpp
index 5f6ce086de753390535c2367a06389ae3ce50895..42f38b202b9d0f3007a665e009018780290ad43c 100644 (file)
--- a/contrib/src/gizmos/statpict.cpp
+++ b/contrib/src/gizmos/statpict.cpp
@@ -43,9 +43,9 @@ bool wxStaticPicture::Create(wxWindow *parent, wxWindowID id,
     wxSize size = s ;
     if ( bitmap.Ok() )
     {
     wxSize size = s ;
     if ( bitmap.Ok() )
     {

-        if ( size.x == wxDefaultSize.x )
+        if ( size.x == wxDefaultCoord )

             size.x = bitmap.GetWidth() ;
             size.x = bitmap.GetWidth() ;

-        if ( size.y == wxDefaultSize.y )
+        if ( size.y == wxDefaultCoord )

             size.y = bitmap.GetHeight() ;
     }
 
             size.y = bitmap.GetHeight() ;
     }
 

diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp
index c148ccc0ddfabf44b2c013a6b985c71aac161241..f24ce5f0f17375e41f289191379df6de0158a59c 100644 (file)
--- a/contrib/utils/wxrcedit/editor.cpp
+++ b/contrib/utils/wxrcedit/editor.cpp
@@ -192,7 +192,7 @@ EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename)
 
     wxConfigBase *cfg = wxConfigBase::Get();
 
 
     wxConfigBase *cfg = wxConfigBase::Get();
 

-    SetSize(wxRect(wxPoint(cfg->Read(_T("editor_x"), wxDefaultPosition.x), cfg->Read(_T("editor_y"), wxDefaultPosition.y)),
+    SetSize(wxRect(wxPoint(cfg->Read(_T("editor_x"), wxDefaultCoord), cfg->Read(_T("editor_y"), wxDefaultCoord)),

             wxSize(cfg->Read(_T("editor_w"), 400), cfg->Read(_T("editor_h"), 400))));
 
     m_SelectedNode = NULL;
             wxSize(cfg->Read(_T("editor_w"), 400), cfg->Read(_T("editor_h"), 400))));
 
     m_SelectedNode = NULL;


@@ -228,16 +228,16 @@ EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename)
     toolBar->SetMargins(2, 2);
     toolBar->SetToolBitmapSize(wxSize(24, 24));
     toolBar -> AddTool(ID_EXIT, wxBITMAP(close), wxNullBitmap,
     toolBar->SetMargins(2, 2);
     toolBar->SetToolBitmapSize(wxSize(24, 24));
     toolBar -> AddTool(ID_EXIT, wxBITMAP(close), wxNullBitmap,

-                       false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL,
+                       false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                        _("Quit the editor"));
     toolBar -> AddTool(ID_OPEN, wxBITMAP(open), wxNullBitmap,
                        _("Quit the editor"));
     toolBar -> AddTool(ID_OPEN, wxBITMAP(open), wxNullBitmap,

-                       false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL,
+                       false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                        _("Open XML resource file"));
     toolBar -> AddTool(ID_SAVE, wxBITMAP(save), wxNullBitmap,
                        _("Open XML resource file"));
     toolBar -> AddTool(ID_SAVE, wxBITMAP(save), wxNullBitmap,

-                       false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL,
+                       false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                        _("Save XML file"));
     toolBar -> AddTool(ID_PREVIEW, wxBITMAP(preview), wxNullBitmap,
                        _("Save XML file"));
     toolBar -> AddTool(ID_PREVIEW, wxBITMAP(preview), wxNullBitmap,

-                       false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL,
+                       false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                        _("Preview"));
     toolBar -> Realize();
 
                        _("Preview"));
     toolBar -> Realize();
 

diff --git a/contrib/utils/wxrcedit/pe_adv.cpp b/contrib/utils/wxrcedit/pe_adv.cpp
index 02b5e5dd6207001d6a64e41c2d53976bb8628da2..7698cf680462944e8ab972385f1a81c9f567fcfb 100644 (file)
--- a/contrib/utils/wxrcedit/pe_adv.cpp
+++ b/contrib/utils/wxrcedit/pe_adv.cpp
@@ -151,7 +151,7 @@ void PropEditCtrlFlags::OnDetails()
     wxConfigBase *cfg = wxConfigBase::Get();
 
     wxDialog dlg(m_PropFrame, wxID_ANY, _("Flags"),
     wxConfigBase *cfg = wxConfigBase::Get();
 
     wxDialog dlg(m_PropFrame, wxID_ANY, _("Flags"),

-            wxPoint(cfg->Read(_T("flagsdlg_x"), wxDefaultPosition.x), cfg->Read(_T("flagsdlg_y"), wxDefaultPosition.y)),
+            wxPoint(cfg->Read(_T("flagsdlg_x"), wxDefaultCoord), cfg->Read(_T("flagsdlg_y"), wxDefaultCoord)),

             wxSize(cfg->Read(_T("flagsdlg_w"), 300), cfg->Read(_T("flagsdlg_h"), 300)),
             wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
     wxSizer *sz = new wxBoxSizer(wxVERTICAL);
             wxSize(cfg->Read(_T("flagsdlg_w"), 300), cfg->Read(_T("flagsdlg_h"), 300)),
             wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
     wxSizer *sz = new wxBoxSizer(wxVERTICAL);

diff --git a/contrib/utils/wxrcedit/preview.cpp b/contrib/utils/wxrcedit/preview.cpp
index 66ffaf3865437fc09f73c6c52d8b4c25f76d7215..1fee24ca6e7c477b8e4a1c90e99147af96b6fde2 100644 (file)
--- a/contrib/utils/wxrcedit/preview.cpp
+++ b/contrib/utils/wxrcedit/preview.cpp
@@ -80,7 +80,7 @@ PreviewFrame::PreviewFrame()
     ResetResource();
 
     wxConfigBase *cfg = wxConfigBase::Get();
     ResetResource();
 
     wxConfigBase *cfg = wxConfigBase::Get();

-    SetSize(wxRect(wxPoint(cfg->Read(_T("previewframe_x"), wxDefaultPosition.x), cfg->Read(_T("previewframe_y"), wxDefaultPosition.y)),
+    SetSize(wxRect(wxPoint(cfg->Read(_T("previewframe_x"), wxDefaultCoord), cfg->Read(_T("previewframe_y"), wxDefaultCoord)),

             wxSize(cfg->Read(_T("previewframe_w"), 400), cfg->Read(_T("previewframe_h"), 400))));
 
     m_Splitter = new wxSplitterWindow(this, wxID_ANY);
             wxSize(cfg->Read(_T("previewframe_w"), 400), cfg->Read(_T("previewframe_h"), 400))));
 
     m_Splitter = new wxSplitterWindow(this, wxID_ANY);

diff --git a/contrib/utils/wxrcedit/propedit.cpp b/contrib/utils/wxrcedit/propedit.cpp
index 294d908811de5bfafbd7441bd72a6b7c41c343e0..35e267635570898d6f81755476bb9698d16aa628 100644 (file)
--- a/contrib/utils/wxrcedit/propedit.cpp
+++ b/contrib/utils/wxrcedit/propedit.cpp
@@ -62,10 +62,10 @@ void PropEditCtrl::BeginEdit(const wxRect& rect, wxTreeItemId ti)
         sz->Add(m_TheCtrl, 1);
         if (HasDetails())
             sz->Add(new wxButton(this, ID_DETAILS, _T("..."), wxDefaultPosition,
         sz->Add(m_TheCtrl, 1);
         if (HasDetails())
             sz->Add(new wxButton(this, ID_DETAILS, _T("..."), wxDefaultPosition,

-                    wxSize(16,wxDefaultSize.y)));
+                    wxSize(16,wxDefaultCoord)));

         if (HasClearButton())
             sz->Add(new wxButton(this, ID_CLEAR, _T("X"), wxDefaultPosition,
         if (HasClearButton())
             sz->Add(new wxButton(this, ID_CLEAR, _T("X"), wxDefaultPosition,

-                    wxSize(16,wxDefaultSize.y)));
+                    wxSize(16,wxDefaultCoord)));

         SetSizer(sz);
         m_Created = true;
     }
         SetSizer(sz);
         m_Created = true;
     }

diff --git a/contrib/utils/wxrcedit/propframe.cpp b/contrib/utils/wxrcedit/propframe.cpp
index 898cdc1f9a877ebbf4c44cc7f2add0ed42710f83..ee124f4048c1fb448cef446e3134282c797c2bad 100644 (file)
--- a/contrib/utils/wxrcedit/propframe.cpp
+++ b/contrib/utils/wxrcedit/propframe.cpp
@@ -129,7 +129,7 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl
             wxRect bounding;
             GetBoundingRect(id, bounding);
 
             wxRect bounding;
             GetBoundingRect(id, bounding);
 

-            m_EditCtrl->Move(wxDefaultPosition.x, bounding.y);
+            m_EditCtrl->Move(wxDefaultCoord, bounding.y);

         }
 
         PropEditCtrl *m_EditCtrl;
         }
 
         PropEditCtrl *m_EditCtrl;


@@ -245,7 +245,7 @@ PropertiesFrame::PropertiesFrame()
     m_tree->SetCompanionWindow(m_valueWindow);
 
     wxConfigBase *cfg = wxConfigBase::Get();
     m_tree->SetCompanionWindow(m_valueWindow);
 
     wxConfigBase *cfg = wxConfigBase::Get();

-    SetSize(wxRect(wxPoint(cfg->Read(_T("propertiesframe_x"), wxDefaultPosition.x), cfg->Read(_T("propertiesframe_y"), wxDefaultPosition.y)),
+    SetSize(wxRect(wxPoint(cfg->Read(_T("propertiesframe_x"), wxDefaultCoord), cfg->Read(_T("propertiesframe_y"), wxDefaultCoord)),

             wxSize(cfg->Read(_T("propertiesframe_w"), 200), cfg->Read(_T("propertiesframe_h"), 200))));
 
 
             wxSize(cfg->Read(_T("propertiesframe_w"), 200), cfg->Read(_T("propertiesframe_h"), 200))));
 
 

diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index e89f515fc17e837581e34d66ce77816e65827359..2ccd9527341e8827ebd29d068ea786565efd80db 100644 (file)
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -154,7 +154,7 @@ IMPLEMENT_APP(LifeApp)
 
 // some shortcuts
 #define ADD_TOOL(id, bmp, tooltip, help) \
 
 // some shortcuts
 #define ADD_TOOL(id, bmp, tooltip, help) \

-    toolBar->AddTool(id, bmp, wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *)NULL, tooltip, help)
+    toolBar->AddTool(id, bmp, wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *)NULL, tooltip, help)

 
 
 // --------------------------------------------------------------------------
 
 
 // --------------------------------------------------------------------------


@@ -296,7 +296,7 @@ LifeFrame::LifeFrame() : wxFrame( (wxFrame *) NULL, wxID_ANY,
     wxSlider *slider = new wxSlider(panel2, ID_SLIDER,
         5, 1, 10,
         wxDefaultPosition,
     wxSlider *slider = new wxSlider(panel2, ID_SLIDER,
         5, 1, 10,
         wxDefaultPosition,

-        wxSize(200, wxDefaultSize.y),
+        wxSize(200, wxDefaultCoord),

         wxSL_HORIZONTAL | wxSL_AUTOTICKS);
 
     UpdateInfoText();
         wxSL_HORIZONTAL | wxSL_AUTOTICKS);
 
     UpdateInfoText();

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index 2c9bb01cf636181e7debd4d84d89fd36238af5e0..aab52549dcc71e5f31c99e234344b455147390c8 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -213,8 +213,8 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
                                        const wxString& caption,
                                        const wxArrayString& choices,
                                        wxWindow *parent = (wxWindow *) NULL,
                                        const wxString& caption,
                                        const wxArrayString& choices,
                                        wxWindow *parent = (wxWindow *) NULL,

-                                       int x = wxDefaultPosition.x,
-                                       int y = wxDefaultPosition.y,
+                                       int x = wxDefaultCoord,
+                                       int y = wxDefaultCoord,

                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
                                        int height = wxCHOICE_HEIGHT);
                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
                                        int height = wxCHOICE_HEIGHT);


@@ -223,8 +223,8 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
                                        const wxString& caption,
                                        int n, const wxString *choices,
                                        wxWindow *parent = (wxWindow *) NULL,
                                        const wxString& caption,
                                        int n, const wxString *choices,
                                        wxWindow *parent = (wxWindow *) NULL,

-                                       int x = wxDefaultPosition.x,
-                                       int y = wxDefaultPosition.y,
+                                       int x = wxDefaultCoord,
+                                       int y = wxDefaultCoord,

                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
                                        int height = wxCHOICE_HEIGHT);
                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
                                        int height = wxCHOICE_HEIGHT);


@@ -235,8 +235,8 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
                                        const wxString& caption,
                                        const wxArrayString& choices,
                                        wxWindow *parent = (wxWindow *) NULL,
                                        const wxString& caption,
                                        const wxArrayString& choices,
                                        wxWindow *parent = (wxWindow *) NULL,

-                                       int x = wxDefaultPosition.x,
-                                       int y = wxDefaultPosition.y,
+                                       int x = wxDefaultCoord,
+                                       int y = wxDefaultCoord,

                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
                                        int height = wxCHOICE_HEIGHT);
                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
                                        int height = wxCHOICE_HEIGHT);


@@ -245,8 +245,8 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
                                        const wxString& caption,
                                        int n, const wxString *choices,
                                        wxWindow *parent = (wxWindow *) NULL,
                                        const wxString& caption,
                                        int n, const wxString *choices,
                                        wxWindow *parent = (wxWindow *) NULL,

-                                       int x = wxDefaultPosition.x,
-                                       int y = wxDefaultPosition.y,
+                                       int x = wxDefaultCoord,
+                                       int y = wxDefaultCoord,

                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
                                        int height = wxCHOICE_HEIGHT);
                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
                                        int height = wxCHOICE_HEIGHT);


@@ -257,8 +257,8 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
                                         const wxArrayString& choices,
                                         void **client_data,
                                         wxWindow *parent = (wxWindow *) NULL,
                                         const wxArrayString& choices,
                                         void **client_data,
                                         wxWindow *parent = (wxWindow *) NULL,

-                                        int x = wxDefaultPosition.x,
-                                        int y = wxDefaultPosition.y,
+                                        int x = wxDefaultCoord,
+                                        int y = wxDefaultCoord,

                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);
                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);


@@ -268,8 +268,8 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
                                         int n, const wxString *choices,
                                         void **client_data,
                                         wxWindow *parent = (wxWindow *) NULL,
                                         int n, const wxString *choices,
                                         void **client_data,
                                         wxWindow *parent = (wxWindow *) NULL,

-                                        int x = wxDefaultPosition.x,
-                                        int y = wxDefaultPosition.y,
+                                        int x = wxDefaultCoord,
+                                        int y = wxDefaultCoord,

                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);
                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);


@@ -282,8 +282,8 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
                                         const wxString& caption,
                                         int n, const wxString *choices,
                                         wxWindow *parent = (wxWindow *) NULL,
                                         const wxString& caption,
                                         int n, const wxString *choices,
                                         wxWindow *parent = (wxWindow *) NULL,

-                                        int x = wxDefaultPosition.x,
-                                        int y = wxDefaultPosition.y,
+                                        int x = wxDefaultCoord,
+                                        int y = wxDefaultCoord,

                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);
                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);


@@ -293,8 +293,8 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
                                         const wxString& caption,
                                         const wxArrayString& choices,
                                         wxWindow *parent = (wxWindow *) NULL,
                                         const wxString& caption,
                                         const wxArrayString& choices,
                                         wxWindow *parent = (wxWindow *) NULL,

-                                        int x = wxDefaultPosition.x,
-                                        int y = wxDefaultPosition.y,
+                                        int x = wxDefaultCoord,
+                                        int y = wxDefaultCoord,

                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);
                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 41b7f69deefb69a46d55cf46b98804685b556887..a71086fcde433dfedfd7dfd418f27c27d8649128 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -76,7 +76,7 @@ public:
 
   bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
             wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,
 
   bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
             wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,

-            wxCoord xsrcMask = wxDefaultPosition.x, wxCoord ysrcMask = wxDefaultPosition.y);
+            wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);

   bool CanDrawBitmap() const { return true; }
 
   void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
   bool CanDrawBitmap() const { return true; }
 
   void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index dae05bca1856fdabd06c654a8441a1359d305ed7..774c6f82365af529e0ef70d6bfbf9bfae2e03b08 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -1533,7 +1533,7 @@ public:
     //
 
     wxGrid( wxWindow *parent,
     //
 
     wxGrid( wxWindow *parent,

-            int x, int y, int w = wxDefaultSize.x, int h = wxDefaultSize.y,
+            int x, int y, int w = wxDefaultCoord, int h = wxDefaultCoord,

             long style = wxWANTS_CHARS,
             const wxString& name = wxPanelNameStr )
         : wxScrolledWindow( parent, wxID_ANY, wxPoint(x,y), wxSize(w,h),
             long style = wxWANTS_CHARS,
             const wxString& name = wxPanelNameStr )
         : wxScrolledWindow( parent, wxID_ANY, wxPoint(x,y), wxSize(w,h),

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 8ca22f234390aa7166889ace96a726bff5483339..b686a423822a50e0327d65aa161cb6fbbc6bb1c7 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -160,10 +160,10 @@ public:
     // no size hints
     virtual void SetSizeHints( int WXUNUSED(minW),
                                int WXUNUSED(minH),
     // no size hints
     virtual void SetSizeHints( int WXUNUSED(minW),
                                int WXUNUSED(minH),

-                               int WXUNUSED(maxW) = wxDefaultSize.x,
-                               int WXUNUSED(maxH) = wxDefaultSize.y,
-                               int WXUNUSED(incW) = wxDefaultSize.x,
-                               int WXUNUSED(incH) = wxDefaultSize.y) {}
+                               int WXUNUSED(maxW) = wxDefaultCoord,
+                               int WXUNUSED(maxH) = wxDefaultCoord,
+                               int WXUNUSED(incW) = wxDefaultCoord,
+                               int WXUNUSED(incH) = wxDefaultCoord) {}

 
 #if wxUSE_TOOLBAR
     // no toolbar bars
 
 #if wxUSE_TOOLBAR
     // no toolbar bars

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index 8f8bc0e481ba03b726d00c62cf7970246ae8b55b..b255dd89a46e3a7227b6f6d69bb150f0de4d6be6 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -78,8 +78,8 @@ wxGetTextFromUser(const wxString& message,
                   const wxString& caption = wxGetTextFromUserPromptStr,
                   const wxString& default_value = wxEmptyString,
                   wxWindow *parent = (wxWindow *) NULL,
                   const wxString& caption = wxGetTextFromUserPromptStr,
                   const wxString& default_value = wxEmptyString,
                   wxWindow *parent = (wxWindow *) NULL,

-                  int x = wxDefaultPosition.x,
-                  int y = wxDefaultPosition.y,
+                  int x = wxDefaultCoord,
+                  int y = wxDefaultCoord,

                   bool centre = true);
 
 wxString WXDLLEXPORT
                   bool centre = true);
 
 wxString WXDLLEXPORT

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 646034585ef0eff99208b2e9fa70a94aa7b6af06..098505621e695fe6be235908e581d67a72e17003 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -660,8 +660,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
 #if wxUSE_CHOICE
     panel = new wxPanel(m_notebook);
 
 #if wxUSE_CHOICE
     panel = new wxPanel(m_notebook);

-    m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultSize.y), 5, choices );
-    m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultSize.y),
+    m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultCoord), 5, choices );
+    m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultCoord),

                                    5, choices, wxCB_SORT );
 
     SetChoiceClientData(wxT("choice"), m_choice);
                                    5, choices, wxCB_SORT );
 
     SetChoiceClientData(wxT("choice"), m_choice);


@@ -684,7 +684,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     (void)new wxStaticBox( panel, wxID_ANY, _T("&Box around combobox"),
                            wxPoint(5, 5), wxSize(150, 100));
     m_combo = new MyComboBox( panel, ID_COMBO, _T("This"),
     (void)new wxStaticBox( panel, wxID_ANY, _T("&Box around combobox"),
                            wxPoint(5, 5), wxSize(150, 100));
     m_combo = new MyComboBox( panel, ID_COMBO, _T("This"),

-                              wxPoint(20,25), wxSize(120, wxDefaultSize.y),
+                              wxPoint(20,25), wxSize(120, wxDefaultCoord),

                               5, choices,
                               wxCB_READONLY | wxPROCESS_ENTER);
     m_combo->SetBackgroundColour(*wxBLUE);
                               5, choices,
                               wxCB_READONLY | wxPROCESS_ENTER);
     m_combo->SetBackgroundColour(*wxBLUE);


@@ -734,7 +734,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_gaugeVert = new wxGauge( panel, wxID_ANY, 100,
                                wxPoint(195,35), wxSize(30, 90),
                                wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER );
     m_gaugeVert = new wxGauge( panel, wxID_ANY, 100,
                                wxPoint(195,35), wxSize(30, 90),
                                wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER );

-    m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,wxDefaultSize.y),
+    m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,wxDefaultCoord),

                              wxSL_AUTOTICKS | wxSL_LABELS );
     m_slider->SetTickFreq(40, 0);
 #if wxUSE_TOOLTIPS
                              wxSL_AUTOTICKS | wxSL_LABELS );
     m_slider->SetTickFreq(40, 0);
 #if wxUSE_TOOLTIPS


@@ -750,7 +750,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     (void)new wxStaticText( panel, wxID_ANY,
                             _T("Drag the slider!"),
                             wxPoint(250,30),
     (void)new wxStaticText( panel, wxID_ANY,
                             _T("Drag the slider!"),
                             wxPoint(250,30),

-                            wxSize(240, wxDefaultSize.y)
+                            wxSize(240, wxDefaultCoord)

                           );
 #else
     (void)new wxStaticText( panel, wxID_ANY,
                           );
 #else
     (void)new wxStaticText( panel, wxID_ANY,


@@ -767,9 +767,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     int initialSpinValue = -5;
     wxString s;
     s << initialSpinValue;
     int initialSpinValue = -5;
     wxString s;
     s << initialSpinValue;

-    m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultSize.y) );
+    m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultCoord) );

 #if wxUSE_SPINBTN
 #if wxUSE_SPINBTN

-    m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, wxDefaultSize.y) );
+    m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, wxDefaultCoord) );

     m_spinbutton->SetRange(-40,30);
     m_spinbutton->SetValue(initialSpinValue);
 
     m_spinbutton->SetRange(-40,30);
     m_spinbutton->SetValue(initialSpinValue);
 


@@ -778,7 +778,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 #endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL
 #endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL

-    m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, _T(""), wxPoint(200, 160), wxSize(80, wxDefaultSize.y) );
+    m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, _T(""), wxPoint(200, 160), wxSize(80, wxDefaultCoord) );

     m_spinctrl->SetRange(10,30);
     m_spinctrl->SetValue(15);
 #endif // wxUSE_SPINCTRL
     m_spinctrl->SetRange(10,30);
     m_spinctrl->SetValue(15);
 #endif // wxUSE_SPINCTRL

diff --git a/samples/db/dbtest.cpp b/samples/db/dbtest.cpp
index 95d9b392ea39d6cdd88586c5ec8227d03fa6a144..016c7248860a3b33de12e95693c57c7c01d4631d 100644 (file)
--- a/samples/db/dbtest.cpp
+++ b/samples/db/dbtest.cpp
@@ -1571,7 +1571,7 @@ bool CeditorDlg::Initialize()
     choice_strings[3] = wxT("Spanish");
     choice_strings[4] = wxT("Other");
 
     choice_strings[3] = wxT("Spanish");
     choice_strings[4] = wxT("Other");
 

-    pNativeLangChoice = new wxChoice(this, EDITOR_DIALOG_LANG_CHOICE,                             wxPoint( 17, 346), wxSize(277,  wxDefaultSize.y), 5, choice_strings);
+    pNativeLangChoice = new wxChoice(this, EDITOR_DIALOG_LANG_CHOICE,                             wxPoint( 17, 346), wxSize(277,  wxDefaultCoord), 5, choice_strings);

     pNativeLangMsg    = new wxStaticText(this, EDITOR_DIALOG_LANG_MSG,   wxT("Native language:"), wxPoint( 17, 330), wxDefaultSize, 0, wxT("NativeLangMsg"));
 
     wxString radio_strings[2];
     pNativeLangMsg    = new wxStaticText(this, EDITOR_DIALOG_LANG_MSG,   wxT("Native language:"), wxPoint( 17, 330), wxDefaultSize, 0, wxT("NativeLangMsg"));
 
     wxString radio_strings[2];

diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp
index a41b00aa0d3517343d1dee943813ef0a69c58dab..a3b072b381ec57adccae106b76c83b57e0da967d 100644 (file)
--- a/samples/docview/view.cpp
+++ b/samples/docview/view.cpp
@@ -57,7 +57,7 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
         // X seems to require a forced resize
         int x, y;
         frame->GetSize(&x, &y);
         // X seems to require a forced resize
         int x, y;
         frame->GetSize(&x, &y);

-        frame->SetSize(wxDefaultPosition.x, wxDefaultPosition.y, x, y);
+        frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);

 #endif
         frame->Show(true);
     }
 #endif
         frame->Show(true);
     }


@@ -168,7 +168,7 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
     // X seems to require a forced resize
     int x, y;
     frame->GetSize(&x, &y);
     // X seems to require a forced resize
     int x, y;
     frame->GetSize(&x, &y);

-    frame->SetSize(wxDefaultPosition.x, wxDefaultPosition.y, x, y);
+    frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);

 #endif
     
     frame->Show(true);
 #endif
     
     frame->Show(true);

diff --git a/samples/docvwmdi/view.cpp b/samples/docvwmdi/view.cpp
index 37b262768795bd1a9ebb50bafe9929fbd2d5ccf8..a598fbc1321a19557f82c28bf9ed6d57d04e0c4a 100644 (file)
--- a/samples/docvwmdi/view.cpp
+++ b/samples/docvwmdi/view.cpp
@@ -54,7 +54,7 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
     // X seems to require a forced resize
     int x, y;
     frame->GetSize(&x, &y);
     // X seems to require a forced resize
     int x, y;
     frame->GetSize(&x, &y);

-    frame->SetSize(wxDefaultPosition.x, wxDefaultPosition.y, x, y);
+    frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);

 #endif
     frame->Show(true);
     Activate(true);
 #endif
     frame->Show(true);
     Activate(true);


@@ -147,7 +147,7 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
   // X seems to require a forced resize
   int x, y;
   frame->GetSize(&x, &y);
   // X seems to require a forced resize
   int x, y;
   frame->GetSize(&x, &y);

-  frame->SetSize(wxDefaultPosition.x, wxDefaultPosition.y, x, y);
+  frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);

 #endif
 
   frame->Show(true);
 #endif
 
   frame->Show(true);

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 33582119bc395bf3a97f01de159778b61376195a..161b1d84c343668ade362ee17c1e1ae9a4705e38 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -318,24 +318,24 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
     int width = 24;
     int currentX = 5;
 
     int width = 24;
     int currentX = 5;
 

-    toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("New file"));
+    toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("New file"));

     currentX += width + 5;
     currentX += width + 5;

-    toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Open file"));
+    toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Open file"));

     currentX += width + 5;
     currentX += width + 5;

-    toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Save file"));
+    toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Save file"));

     currentX += width + 5;
     toolBar->AddSeparator();
     currentX += width + 5;
     toolBar->AddSeparator();

-    toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Copy"));
+    toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Copy"));

     currentX += width + 5;
     currentX += width + 5;

-    toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Cut"));
+    toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Cut"));

     currentX += width + 5;
     currentX += width + 5;

-    toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Paste"));
+    toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Paste"));

     currentX += width + 5;
     toolBar->AddSeparator();
     currentX += width + 5;
     toolBar->AddSeparator();

-    toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Print"));
+    toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Print"));

     currentX += width + 5;
     toolBar->AddSeparator();
     currentX += width + 5;
     toolBar->AddSeparator();

-    toolBar->AddTool( MDI_ABOUT, *bitmaps[7], wxNullBitmap, true, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Help"));
+    toolBar->AddTool( MDI_ABOUT, *bitmaps[7], wxNullBitmap, true, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Help"));

 
     toolBar->Realize();
 
 
     toolBar->Realize();
 

diff --git a/samples/minifram/minifram.cpp b/samples/minifram/minifram.cpp
index bdae1803e09157bd1b3f33e9269305ad8500c2cd..f9d5f4e22c8909e3dbcc7f40cdcfdc624727426d 100644 (file)
--- a/samples/minifram/minifram.cpp
+++ b/samples/minifram/minifram.cpp
@@ -100,24 +100,24 @@ bool MyApp::InitToolbar(wxToolBar* toolBar)
   int width = 16;
   int currentX = 5;
 
   int width = 16;
   int currentX = 5;
 

-  toolBar->AddTool(wxID_NEW, *(toolBarBitmaps[0]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("New file"));
+  toolBar->AddTool(wxID_NEW, *(toolBarBitmaps[0]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("New file"));

   currentX += width + 5;
   currentX += width + 5;

-  toolBar->AddTool(wxID_OPEN, *(toolBarBitmaps[1]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Open file"));
+  toolBar->AddTool(wxID_OPEN, *(toolBarBitmaps[1]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Open file"));

   currentX += width + 5;
   currentX += width + 5;

-  toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Save file"));
+  toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Save file"));

   currentX += width + 5;
   toolBar->AddSeparator();
   currentX += width + 5;
   toolBar->AddSeparator();

-  toolBar->AddTool(wxID_COPY, *(toolBarBitmaps[3]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Copy"));
+  toolBar->AddTool(wxID_COPY, *(toolBarBitmaps[3]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Copy"));

   currentX += width + 5;
   currentX += width + 5;

-  toolBar->AddTool(wxID_CUT, *(toolBarBitmaps[4]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Cut"));
+  toolBar->AddTool(wxID_CUT, *(toolBarBitmaps[4]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Cut"));

   currentX += width + 5;
   currentX += width + 5;

-  toolBar->AddTool(wxID_PASTE, *(toolBarBitmaps[5]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Paste"));
+  toolBar->AddTool(wxID_PASTE, *(toolBarBitmaps[5]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Paste"));

   currentX += width + 5;
   toolBar->AddSeparator();
   currentX += width + 5;
   toolBar->AddSeparator();

-  toolBar->AddTool(wxID_PRINT, *(toolBarBitmaps[6]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Reparent the button"));
+  toolBar->AddTool(wxID_PRINT, *(toolBarBitmaps[6]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Reparent the button"));

   currentX += width + 5;
   toolBar->AddSeparator();
   currentX += width + 5;
   toolBar->AddSeparator();

-  toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Help"));
+  toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Help"));

 
   toolBar->Realize();
 
 
   toolBar->Realize();
 

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 7c9ac1d0be3c6ac41de26a05f3c7b8e384fedcf3..d10150e17c492f85032c674b0b23473565100757 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -36,7 +36,7 @@ bool MyApp::OnInit()
 #if defined(__WXMOTIF__)
     int width, height;
     frame->GetSize(& width, & height);
 #if defined(__WXMOTIF__)
     int width, height;
     frame->GetSize(& width, & height);

-    frame->SetSize(wxDefaultPosition.x, wxDefaultPosition.y, width, height);
+    frame->SetSize(wxDefaultCoord, wxDefaultCoord, width, height);

 #endif
 
     frame->Show();
 #endif
 
     frame->Show();

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index 5484c73dac3f47050665819327fc890883b5016f..bd0cb05c310680920f9e387005453cb631ac1028 100644 (file)
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -217,7 +217,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     m_button = new wxButton( this, ID_QUERYPOS, "Query position", wxPoint(10,110) );
 
 
     m_button = new wxButton( this, ID_QUERYPOS, "Query position", wxPoint(10,110) );
 

-    (void) new wxTextCtrl( this, wxID_ANY, "wxTextCtrl", wxPoint(10,150), wxSize(80,wxDefaultSize.y) );
+    (void) new wxTextCtrl( this, wxID_ANY, "wxTextCtrl", wxPoint(10,150), wxSize(80,wxDefaultCoord) );

 
     (void) new wxRadioButton( this, wxID_ANY, "Disable", wxPoint(10,190) );
 
 
     (void) new wxRadioButton( this, wxID_ANY, "Disable", wxPoint(10,190) );
 


@@ -334,7 +334,7 @@ void MyCanvas::OnMoveButton( wxCommandEvent &event )
     wxWindow *win = FindWindow( event.GetId() );
     wxPoint pt( win->GetPosition() );
     wxLogMessage( wxT("-> Position before move is %d %d"), pt.x, pt.y );
     wxWindow *win = FindWindow( event.GetId() );
     wxPoint pt( win->GetPosition() );
     wxLogMessage( wxT("-> Position before move is %d %d"), pt.x, pt.y );

-    win->Move( wxDefaultPosition.x, pt.y + 10 );
+    win->Move( wxDefaultCoord, pt.y + 10 );

     pt = win->GetPosition();
     wxLogMessage( wxT("-> Position after move is %d %d"), pt.x, pt.y );
 }
     pt = win->GetPosition();
     wxLogMessage( wxT("-> Position after move is %d %d"), pt.x, pt.y );
 }

diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp
index 6ea28ffcec4a6ebb1b4cd0cb154fb0010327ff52..38dbe02a8763d3dd979779cd15ad060da2e16438 100644 (file)
--- a/samples/scrollsub/scrollsub.cpp
+++ b/samples/scrollsub/scrollsub.cpp
@@ -146,8 +146,8 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id,
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER, _T("test canvas") )
 {
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER, _T("test canvas") )
 {

-    MyTopLabels *top = new MyTopLabels( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultSize.x,25) );
-    MyRightLabels *right = new MyRightLabels( this, wxID_ANY, wxDefaultPosition, wxSize(60,wxDefaultSize.y) );
+    MyTopLabels *top = new MyTopLabels( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,25) );
+    MyRightLabels *right = new MyRightLabels( this, wxID_ANY, wxDefaultPosition, wxSize(60,wxDefaultCoord) );

 
     m_canvas = new MyCanvas( this, top, right, wxID_ANY, wxDefaultPosition, wxDefaultSize );
 
 
     m_canvas = new MyCanvas( this, top, right, wxID_ANY, wxDefaultPosition, wxDefaultSize );
 

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index 7579ac0a452338ed35ebe7349ab453b7a39666fa..e9f67fb6ce0b482e64cd22ffe0e85b2fe222a001 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -849,7 +849,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     // single line text controls
 
     m_text = new MyTextCtrl( this, wxID_ANY, _T("Single line."),
     // single line text controls
 
     m_text = new MyTextCtrl( this, wxID_ANY, _T("Single line."),

-                             wxPoint(10,10), wxSize(140,wxDefaultSize.y),
+                             wxPoint(10,10), wxSize(140,wxDefaultCoord),

                              wxTE_PROCESS_ENTER);
     m_text->SetForegroundColour(*wxBLUE);
     m_text->SetBackgroundColour(*wxLIGHT_GREY);
                              wxTE_PROCESS_ENTER);
     m_text->SetForegroundColour(*wxBLUE);
     m_text->SetBackgroundColour(*wxLIGHT_GREY);


@@ -858,13 +858,13 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_text->WriteText( _T("Prepended. ") );
 
     m_password = new MyTextCtrl( this, wxID_ANY, _T(""),
     m_text->WriteText( _T("Prepended. ") );
 
     m_password = new MyTextCtrl( this, wxID_ANY, _T(""),

-      wxPoint(10,50), wxSize(140,wxDefaultSize.y), wxTE_PASSWORD );
+      wxPoint(10,50), wxSize(140,wxDefaultCoord), wxTE_PASSWORD );

 
     m_readonly = new MyTextCtrl( this, wxID_ANY, _T("Read only"),
 
     m_readonly = new MyTextCtrl( this, wxID_ANY, _T("Read only"),

-      wxPoint(10,90), wxSize(140,wxDefaultSize.y), wxTE_READONLY );
+      wxPoint(10,90), wxSize(140,wxDefaultCoord), wxTE_READONLY );

 
     m_limited = new MyTextCtrl(this, wxID_ANY, _T("Max 8 ch"),
 
     m_limited = new MyTextCtrl(this, wxID_ANY, _T("Max 8 ch"),

-                              wxPoint(10, 130), wxSize(140, wxDefaultSize.y));
+                              wxPoint(10, 130), wxSize(140, wxDefaultCoord));

     m_limited->SetMaxLength(8);
 
     // multi line text controls
     m_limited->SetMaxLength(8);
 
     // multi line text controls

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 181b30df0027b564e485117520befe64c8db6da8..ddc516aa7d3e46744715f5e5f534b90432957cbe 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -343,7 +343,7 @@ void MyFrame::RecreateToolbar()
     // adding a combo to a vertical toolbar is not very smart
     if ( m_horzToolbar )
     {
     // adding a combo to a vertical toolbar is not very smart
     if ( m_horzToolbar )
     {

-        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), wxDefaultPosition, wxSize(200,wxDefaultSize.y) );
+        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), wxDefaultPosition, wxSize(200,wxDefaultCoord) );

         combo->Append(_T("This"));
         combo->Append(_T("is a"));
         combo->Append(_T("combobox"));
         combo->Append(_T("This"));
         combo->Append(_T("is a"));
         combo->Append(_T("combobox"));


@@ -483,7 +483,7 @@ void MyFrame::LayoutChildren()
     int offset;
     if ( m_tbar )
     {
     int offset;
     if ( m_tbar )
     {

-        m_tbar->SetSize(wxDefaultSize.x, size.y);
+        m_tbar->SetSize(wxDefaultCoord, size.y);

         m_tbar->Move(0, 0);
 
         offset = m_tbar->GetSize().x;
         m_tbar->Move(0, 0);
 
         offset = m_tbar->GetSize().x;

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 8f7143f57a8b1b29d32a8683fdceefb9ac4ad5c5..afcb8f96707a2599fe3617dd51945134fec76237 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -121,9 +121,9 @@ wxWindowBase::wxWindowBase()
 
     // no constraints on the minimal window size
     m_minWidth =
 
     // no constraints on the minimal window size
     m_minWidth =

-    m_maxWidth = wxDefaultSize.x;
+    m_maxWidth = wxDefaultCoord;

     m_minHeight =
     m_minHeight =

-    m_maxHeight = wxDefaultSize.y;
+    m_maxHeight = wxDefaultCoord;

 
     // invalidiated cache value
     m_bestSizeCache = wxDefaultSize;
 
     // invalidiated cache value
     m_bestSizeCache = wxDefaultSize;


@@ -186,9 +186,9 @@ wxWindowBase::wxWindowBase()
     m_virtualSize = wxDefaultSize;
 
     m_minVirtualWidth =
     m_virtualSize = wxDefaultSize;
 
     m_minVirtualWidth =

-    m_maxVirtualWidth = wxDefaultSize.x;
+    m_maxVirtualWidth = wxDefaultCoord;

     m_minVirtualHeight =
     m_minVirtualHeight =

-    m_maxVirtualHeight = wxDefaultSize.y;
+    m_maxVirtualHeight = wxDefaultCoord;

 
     m_windowVariant = wxWINDOW_VARIANT_NORMAL;
 
 
     m_windowVariant = wxWINDOW_VARIANT_NORMAL;
 


@@ -438,8 +438,8 @@ void wxWindowBase::Centre(int direction)
     int width, height;
     GetSize(&width, &height);
 
     int width, height;
     GetSize(&width, &height);
 

-    int xNew = wxDefaultPosition.x,
-        yNew = wxDefaultPosition.y;
+    int xNew = wxDefaultCoord,
+        yNew = wxDefaultCoord;

 
     if ( direction & wxHORIZONTAL )
         xNew = (widthParent - width)/2;
 
     if ( direction & wxHORIZONTAL )
         xNew = (widthParent - width)/2;


@@ -596,9 +596,9 @@ wxSize wxWindowBase::DoGetBestSize() const
 
             // if the window hadn't been positioned yet, assume that it is in
             // the origin
 
             // if the window hadn't been positioned yet, assume that it is in
             // the origin

-            if ( wx == wxDefaultPosition.x )
+            if ( wx == wxDefaultCoord )

                 wx = 0;
                 wx = 0;

-            if ( wy == wxDefaultPosition.y )
+            if ( wy == wxDefaultCoord )

                 wy = 0;
 
             win->GetSize(&ww, &wh);
                 wy = 0;
 
             win->GetSize(&ww, &wh);


@@ -669,8 +669,8 @@ void wxWindowBase::SetSizeHints(int minW, int minH,
 {
     // setting min width greater than max width leads to infinite loops under
     // X11 and generally doesn't make any sense, so don't allow it
 {
     // setting min width greater than max width leads to infinite loops under
     // X11 and generally doesn't make any sense, so don't allow it

-    wxCHECK_RET( (minW == wxDefaultSize.x || maxW == wxDefaultSize.x || minW <= maxW) &&
-                    (minH == wxDefaultSize.y || maxH == wxDefaultSize.y || minH <= maxH),
+    wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) &&
+                    (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH),

                  _T("min width/height must be less than max width/height!") );
 
     m_minWidth = minW;
                  _T("min width/height must be less than max width/height!") );
 
     m_minWidth = minW;


@@ -735,13 +735,13 @@ void wxWindowBase::SetVirtualSizeHints( int minW, int minH,
 
 void wxWindowBase::DoSetVirtualSize( int x, int y )
 {
 
 void wxWindowBase::DoSetVirtualSize( int x, int y )
 {

-    if ( m_minVirtualWidth != wxDefaultSize.x && m_minVirtualWidth > x )
+    if ( m_minVirtualWidth != wxDefaultCoord && m_minVirtualWidth > x )

         x = m_minVirtualWidth;
         x = m_minVirtualWidth;

-    if ( m_maxVirtualWidth != wxDefaultSize.x && m_maxVirtualWidth < x )
+    if ( m_maxVirtualWidth != wxDefaultCoord && m_maxVirtualWidth < x )

         x = m_maxVirtualWidth;
         x = m_maxVirtualWidth;

-    if ( m_minVirtualHeight != wxDefaultSize.y && m_minVirtualHeight > y )
+    if ( m_minVirtualHeight != wxDefaultCoord && m_minVirtualHeight > y )

         y = m_minVirtualHeight;
         y = m_minVirtualHeight;

-    if ( m_maxVirtualHeight != wxDefaultSize.y && m_maxVirtualHeight < y )
+    if ( m_maxVirtualHeight != wxDefaultCoord && m_maxVirtualHeight < y )

         y = m_maxVirtualHeight;
 
     m_virtualSize = wxSize(x, y);
         y = m_maxVirtualHeight;
 
     m_virtualSize = wxSize(x, y);


@@ -1891,22 +1891,22 @@ void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h)
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {

-        if ( x != wxDefaultPosition.x )
+        if ( x != wxDefaultCoord )

         {
             constr->left.SetValue(x);
             constr->left.SetDone(true);
         }
         {
             constr->left.SetValue(x);
             constr->left.SetDone(true);
         }

-        if ( y != wxDefaultPosition.y )
+        if ( y != wxDefaultCoord )

         {
             constr->top.SetValue(y);
             constr->top.SetDone(true);
         }
         {
             constr->top.SetValue(y);
             constr->top.SetDone(true);
         }

-        if ( w != wxDefaultSize.x )
+        if ( w != wxDefaultCoord )

         {
             constr->width.SetValue(w);
             constr->width.SetDone(true);
         }
         {
             constr->width.SetValue(w);
             constr->width.SetDone(true);
         }

-        if ( h != wxDefaultSize.y )
+        if ( h != wxDefaultCoord )

         {
             constr->height.SetValue(h);
             constr->height.SetDone(true);
         {
             constr->height.SetValue(h);
             constr->height.SetDone(true);


@@ -1919,12 +1919,12 @@ void wxWindowBase::MoveConstraint(int x, int y)
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {

-        if ( x != wxDefaultPosition.x )
+        if ( x != wxDefaultCoord )

         {
             constr->left.SetValue(x);
             constr->left.SetDone(true);
         }
         {
             constr->left.SetValue(x);
             constr->left.SetDone(true);
         }

-        if ( y != wxDefaultPosition.y )
+        if ( y != wxDefaultCoord )

         {
             constr->top.SetValue(y);
             constr->top.SetDone(true);
         {
             constr->top.SetValue(y);
             constr->top.SetDone(true);

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 63e627152071311e0847658ea63abe7eedb17cd7..c6616b237c6c813bf52c4bbf811f72a56e7e9b5f 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -200,10 +200,10 @@ wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal)
     }
 
     SetSelection(m_cal->GetDate().GetMonth());
     }
 
     SetSelection(m_cal->GetDate().GetMonth());

-    SetSize(wxDefaultPosition.x,
-            wxDefaultPosition.y,
-            wxDefaultSize.x,
-            wxDefaultSize.y,
+    SetSize(wxDefaultCoord,
+            wxDefaultCoord,
+            wxDefaultCoord,
+            wxDefaultCoord,

             wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
 }
 
             wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
 }
 

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index d94244ca19a7579d8b2aec7af6e887db804542e5..f87cb7b8bda7f4d679f314dbcbd7b3bea615f481 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -1176,15 +1176,15 @@ void wxGenericDirCtrl::DoResize()
             // correct control height to always be returned, rather
             // than the drop-down list height which is sometimes returned.
             wxSize oldSize = m_filterListCtrl->GetSize();
             // correct control height to always be returned, rather
             // than the drop-down list height which is sometimes returned.
             wxSize oldSize = m_filterListCtrl->GetSize();

-            m_filterListCtrl->SetSize(wxDefaultPosition.x,
-                                      wxDefaultPosition.y,
+            m_filterListCtrl->SetSize(wxDefaultCoord,
+                                      wxDefaultCoord,

                                       oldSize.x+10,
                                       oldSize.x+10,

-                                      wxDefaultSize.y,
+                                      wxDefaultCoord,

                                       wxSIZE_USE_EXISTING);
                                       wxSIZE_USE_EXISTING);

-            m_filterListCtrl->SetSize(wxDefaultPosition.x,
-                                      wxDefaultPosition.y,
+            m_filterListCtrl->SetSize(wxDefaultCoord,
+                                      wxDefaultCoord,

                                       oldSize.x,
                                       oldSize.x,

-                                      wxDefaultSize.y,
+                                      wxDefaultCoord,

                                       wxSIZE_USE_EXISTING);
 #endif
             filterSz = m_filterListCtrl->GetSize();
                                       wxSIZE_USE_EXISTING);
 #endif
             filterSz = m_filterListCtrl->GetSize();

diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index 7faeda83453ecead72464dd5ba17ddb264d6aa67..3c2b2a0465cd2ab0cb2bb3d52f97fbd97c642856 100644 (file)
--- a/src/generic/fdrepdlg.cpp
+++ b/src/generic/fdrepdlg.cpp
@@ -109,7 +109,7 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
     sizer2Col->AddGrowableCol(2);
 
     sizer2Col->Add(new wxStaticText(this, wxID_ANY, _("Search for:"),
     sizer2Col->AddGrowableCol(2);
 
     sizer2Col->Add(new wxStaticText(this, wxID_ANY, _("Search for:"),

-                                    wxDefaultPosition, wxSize(80, wxDefaultSize.y)),
+                                    wxDefaultPosition, wxSize(80, wxDefaultCoord)),

                                     0,
                                     wxALIGN_CENTRE_VERTICAL | wxALIGN_RIGHT);
 
                                     0,
                                     wxALIGN_CENTRE_VERTICAL | wxALIGN_RIGHT);
 


@@ -121,7 +121,7 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
     if ( style & wxFR_REPLACEDIALOG )
     {
         sizer2Col->Add(new wxStaticText(this, wxID_ANY, _("Replace with:"),
     if ( style & wxFR_REPLACEDIALOG )
     {
         sizer2Col->Add(new wxStaticText(this, wxID_ANY, _("Replace with:"),

-                                        wxDefaultPosition, wxSize(80, wxDefaultSize.y)),
+                                        wxDefaultPosition, wxSize(80, wxDefaultCoord)),

                                         0,
                                         wxALIGN_CENTRE_VERTICAL |
                                         wxALIGN_RIGHT | wxTOP, 5);
                                         0,
                                         wxALIGN_CENTRE_VERTICAL |
                                         wxALIGN_RIGHT | wxTOP, 5);

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 83f14c0b82c9e01804abfba5b121310a55832923..066e416df9c3b384fffc3498090bb3b340cb72c9 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2105,7 +2105,7 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)
         sx = mySize.x;
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)
         sx = mySize.x;

-    SetSize(sx, wxDefaultSize.y);
+    SetSize(sx, wxDefaultCoord);

 
     event.Skip();
 }
 
     event.Skip();
 }

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 70cdb8e28851dc50c7b66e42341f3eac7d165490..a82efb71637eba9103d4865803fb10a749d832c2 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -929,7 +929,7 @@ void wxLogDialog::CreateDetailsControls()
     heightMax *= 9;
     heightMax /= 10;
 
     heightMax *= 9;
     heightMax /= 10;
 

-    m_listctrl->SetSize(wxDefaultSize.x, wxMin(height, heightMax));
+    m_listctrl->SetSize(wxDefaultCoord, wxMin(height, heightMax));

 }
 
 void wxLogDialog::OnListSelect(wxListEvent& event)
 }
 
 void wxLogDialog::OnListSelect(wxListEvent& event)


@@ -1065,7 +1065,7 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
     SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
 
     // don't change the width when expanding/collapsing
     SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
 
     // don't change the width when expanding/collapsing

-    SetSize(wxDefaultSize.x, size.y);
+    SetSize(wxDefaultCoord, size.y);

 
 #ifdef __WXGTK__
     // VS: this is neccessary in order to force frame redraw under
 
 #ifdef __WXGTK__
     // VS: this is neccessary in order to force frame redraw under

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index 915d55c73983d55624fc5f00abfb897460efc75e..2aa9f3300f5801109ec7fec14921a24a708bffb5 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -103,7 +103,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     // spin ctrl
     wxString valStr;
     valStr.Printf(wxT("%ld"), m_value);
     // spin ctrl
     wxString valStr;
     valStr.Printf(wxT("%ld"), m_value);

-    m_spinctrl = new wxSpinCtrl(this, wxID_ANY, valStr, wxDefaultPosition, wxSize( 140, wxDefaultSize.y ) );
+    m_spinctrl = new wxSpinCtrl(this, wxID_ANY, valStr, wxDefaultPosition, wxSize( 140, wxDefaultCoord ) );

 #if wxUSE_SPINCTRL
     m_spinctrl->SetRange((int)m_min, (int)m_max);
 #endif
 #if wxUSE_SPINCTRL
     m_spinctrl->SetRange((int)m_min, (int)m_max);
 #endif

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 8639cffdc47f9d39b5998168787adda63686d15d..2b03bcf839c64a7329cbd8cf3790c2ab984fb994 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -177,16 +177,16 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
     if (m_printDialogData.GetFromPage() != 0)
     {
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("From:") ), 0, wxCENTER|wxALL, 5 );
     if (m_printDialogData.GetFromPage() != 0)
     {
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("From:") ), 0, wxCENTER|wxALL, 5 );

-        m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, wxEmptyString, wxDefaultPosition, wxSize(40, wxDefaultSize.y));
+        m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, wxEmptyString, wxDefaultPosition, wxSize(40, wxDefaultCoord));

         bottomsizer->Add( m_fromText, 1, wxCENTER|wxRIGHT, 10 );
 
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("To:") ), 0, wxCENTER|wxALL, 5);
         bottomsizer->Add( m_fromText, 1, wxCENTER|wxRIGHT, 10 );
 
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("To:") ), 0, wxCENTER|wxALL, 5);

-        m_toText = new wxTextCtrl(this, wxPRINTID_TO, wxEmptyString, wxDefaultPosition, wxSize(40, wxDefaultSize.y));
+        m_toText = new wxTextCtrl(this, wxPRINTID_TO, wxEmptyString, wxDefaultPosition, wxSize(40, wxDefaultCoord));

         bottomsizer->Add( m_toText, 1, wxCENTER|wxRIGHT, 10 );
     }
 
     bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Copies:") ), 0, wxCENTER|wxALL, 5 );
         bottomsizer->Add( m_toText, 1, wxCENTER|wxRIGHT, 10 );
     }
 
     bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Copies:") ), 0, wxCENTER|wxALL, 5 );

-    m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, wxEmptyString, wxPoint(252, 130), wxSize(40, wxDefaultSize.y));
+    m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, wxEmptyString, wxPoint(252, 130), wxSize(40, wxDefaultCoord));

     bottomsizer->Add( m_noCopiesText, 1, wxCENTER|wxRIGHT, 10 );
 
     mainsizer->Add( bottomsizer, 0, wxTOP|wxLEFT|wxRIGHT, 12 );
     bottomsizer->Add( m_noCopiesText, 1, wxCENTER|wxRIGHT, 10 );
 
     mainsizer->Add( bottomsizer, 0, wxTOP|wxLEFT|wxRIGHT, 12 );


@@ -443,14 +443,14 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data)
 
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(340, 30));
 
 
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(340, 30));
 

-    m_printerCommandText = new wxTextCtrl(this, wxPRINTID_COMMAND, wxEmptyString, wxPoint(360, 55), wxSize(150, wxDefaultSize.y));
+    m_printerCommandText = new wxTextCtrl(this, wxPRINTID_COMMAND, wxEmptyString, wxPoint(360, 55), wxSize(150, wxDefaultCoord));

 
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer options:"), wxPoint(340, 110));
 
 
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer options:"), wxPoint(340, 110));
 

-    m_printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, wxEmptyString, wxPoint(360, 135), wxSize(150, wxDefaultSize.y));
+    m_printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, wxEmptyString, wxPoint(360, 135), wxSize(150, wxDefaultCoord));

 
 

-    wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(130, 200), wxSize(80, wxDefaultSize.y));
-    (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(320, 200), wxSize(80, wxDefaultSize.y));
+    wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(130, 200), wxSize(80, wxDefaultCoord));
+    (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(320, 200), wxSize(80, wxDefaultCoord));

 
     okButton->SetDefault();
     okButton->SetFocus();
 
     okButton->SetDefault();
     okButton->SetFocus();


@@ -542,7 +542,7 @@ wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
                                          wxPRINTID_PAPERSIZE,
                                          _("Paper Size"),
                                          wxPoint(*x, *y),
                                          wxPRINTID_PAPERSIZE,
                                          _("Paper Size"),
                                          wxPoint(*x, *y),

-                                         wxSize(width, wxDefaultSize.y),
+                                         wxSize(width, wxDefaultCoord),

                                          n, choices );
 
     //    SetFont(thisFont);
                                          n, choices );
 
     //    SetFont(thisFont);


@@ -622,7 +622,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
                                         wxPRINTID_PAPERSIZE,
                                         _("Paper Size"),
                                         wxDefaultPosition,
                                         wxPRINTID_PAPERSIZE,
                                         _("Paper Size"),
                                         wxDefaultPosition,

-                                        wxSize(300, wxDefaultSize.y),
+                                        wxSize(300, wxDefaultCoord),

                                         n, choices );
     topsizer->Add( m_paperTypeChoice, 1, wxEXPAND|wxALL, 5 );
 //  m_paperTypeChoice->SetSelection(sel);
                                         n, choices );
     topsizer->Add( m_paperTypeChoice, 1, wxEXPAND|wxALL, 5 );
 //  m_paperTypeChoice->SetSelection(sel);


@@ -650,8 +650,8 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
     table->Add( column1, 0, wxALL | wxEXPAND, 5 );
 
     wxBoxSizer *column2 = new wxBoxSizer( wxVERTICAL );
     table->Add( column1, 0, wxALL | wxEXPAND, 5 );
 
     wxBoxSizer *column2 = new wxBoxSizer( wxVERTICAL );

-    m_marginLeftText = new wxTextCtrl(this, wxPRINTID_LEFTMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultSize.y));
-    m_marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultSize.y));
+    m_marginLeftText = new wxTextCtrl(this, wxPRINTID_LEFTMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));
+    m_marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));

     column2->Add( m_marginLeftText, 1, wxALL, 5 );
     column2->Add( m_marginTopText, 1, wxALL, 5 );
     table->Add( column2, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );
     column2->Add( m_marginLeftText, 1, wxALL, 5 );
     column2->Add( m_marginTopText, 1, wxALL, 5 );
     table->Add( column2, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );


@@ -662,8 +662,8 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
     table->Add( column3, 0, wxALL | wxEXPAND, 5 );
 
     wxBoxSizer *column4 = new wxBoxSizer( wxVERTICAL );
     table->Add( column3, 0, wxALL | wxEXPAND, 5 );
 
     wxBoxSizer *column4 = new wxBoxSizer( wxVERTICAL );

-    m_marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultSize.y));
-    m_marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultSize.y));
+    m_marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));
+    m_marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));

     column4->Add( m_marginRightText, 1, wxALL, 5 );
     column4->Add( m_marginBottomText, 1, wxALL, 5 );
     table->Add( column4, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );
     column4->Add( m_marginRightText, 1, wxALL, 5 );
     column4->Add( m_marginBottomText, 1, wxALL, 5 );
     table->Add( column4, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );


@@ -683,7 +683,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
     if ( !m_pageData.GetEnablePrinter() )
         m_printerButton->Enable(false);
     //  if (m_printData.GetEnableHelp())
     if ( !m_pageData.GetEnablePrinter() )
         m_printerButton->Enable(false);
     //  if (m_printData.GetEnableHelp())

-    //  wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), wxDefaultPosition.x, wxDefaultPosition.y, buttonWidth, buttonHeight);
+    //  wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), wxDefaultCoord, wxDefaultCoord, buttonWidth, buttonHeight);

     mainsizer->Add( buttonsizer, 0, wxCENTER|wxALL, 10 );
 
 
     mainsizer->Add( buttonsizer, 0, wxCENTER|wxALL, 10 );
 
 


@@ -810,7 +810,7 @@ wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
                                          wxPRINTID_PAPERSIZE,
                                          _("Paper Size"),
                                          wxPoint(*x, *y),
                                          wxPRINTID_PAPERSIZE,
                                          _("Paper Size"),
                                          wxPoint(*x, *y),

-                                         wxSize(300, wxDefaultSize.y),
+                                         wxSize(300, wxDefaultCoord),

                                          n, choices );
     *y += 35;
     delete[] choices;
                                          n, choices );
     *y += 35;
     delete[] choices;

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index d00ab536136298ba99b9b01301ff7d0d6fb5ba40..ad855afdbc82af2428752c880ed4ebd195a9661b 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -187,8 +187,8 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         wxSashDragStatus status = wxSASH_STATUS_OK;
 
         // the new height and width of the window - if -1, it didn't change
         wxSashDragStatus status = wxSASH_STATUS_OK;
 
         // the new height and width of the window - if -1, it didn't change

-        int newHeight = wxDefaultSize.y,
-            newWidth = wxDefaultSize.x;
+        int newHeight = wxDefaultCoord,
+            newWidth = wxDefaultCoord;

 
         // NB: x and y may be negative and they're relative to the sash window
         //     upper left corner, while xp and yp are expressed in the parent
 
         // NB: x and y may be negative and they're relative to the sash window
         //     upper left corner, while xp and yp are expressed in the parent


@@ -253,7 +253,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
                 break;
         }
 
                 break;
         }
 

-        if ( newHeight == wxDefaultSize.y )
+        if ( newHeight == wxDefaultCoord )

         {
             // didn't change
             newHeight = h;
         {
             // didn't change
             newHeight = h;


@@ -265,7 +265,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
             newHeight = wxMin(newHeight, m_maximumPaneSizeY);
         }
 
             newHeight = wxMin(newHeight, m_maximumPaneSizeY);
         }
 

-        if ( newWidth == wxDefaultSize.x )
+        if ( newWidth == wxDefaultCoord )

         {
             // didn't change
             newWidth = w;
         {
             // didn't change
             newWidth = w;

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 148dd99b20bb6a51419a4c15367ec692e02854a8..066e66f381b6a39c790df4d92dabe4cd1ff970c1 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -62,7 +62,7 @@ public:
         m_spin = spin;
 
         // remove the default minsize, the spinctrl will have one instead
         m_spin = spin;
 
         // remove the default minsize, the spinctrl will have one instead

-        SetSizeHints(wxDefaultSize.x,wxDefaultSize.y);
+        SetSizeHints(wxDefaultCoord,wxDefaultCoord);

     }
 
 protected:
     }
 
 protected:


@@ -111,7 +111,7 @@ public:
         SetWindowStyle(style | wxSP_VERTICAL);
 
         // remove the default minsize, the spinctrl will have one instead
         SetWindowStyle(style | wxSP_VERTICAL);
 
         // remove the default minsize, the spinctrl will have one instead

-        SetSizeHints(wxDefaultSize.x,wxDefaultSize.y);
+        SetSizeHints(wxDefaultCoord,wxDefaultCoord);

     }
 
 protected:
     }
 
 protected:


@@ -234,7 +234,7 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 
     wxCoord wText = width - sizeBtn.x;
     m_text->SetSize(x, y, wText, height);
 
     wxCoord wText = width - sizeBtn.x;
     m_text->SetSize(x, y, wText, height);

-    m_btn->SetSize(x + wText + MARGIN, y, wxDefaultSize.x, height);
+    m_btn->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 3e8dc6024c1a0836e24bdc8d2ae19d92eeeb82f8..3e5213351b0f42a761c564b5ae631716580ae714 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -104,7 +104,7 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
 
   int height = (int)( (11*y)/10 + 2*GetBorderY());
 
 
   int height = (int)( (11*y)/10 + 2*GetBorderY());
 

-  SetSize(wxDefaultPosition.x, wxDefaultPosition.y, wxDefaultSize.x, height);
+  SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);

 
   SetFieldsCount(1);
 
 
   SetFieldsCount(1);
 


@@ -395,7 +395,7 @@ void wxStatusBarGeneric::SetMinHeight(int height)
 
     if ( height > (11*y)/10 )
     {
 
     if ( height > (11*y)/10 )
     {

-        SetSize(wxDefaultPosition.x, wxDefaultPosition.y, wxDefaultSize.x, height + 2*m_borderY);
+        SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height + 2*m_borderY);

     }
 }
 
     }
 }
 

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 52c2c15c722b9b4bed1a5bc8fb6439152b69e0b5..46b3f6ea66b3cd82dd4ad3ffac1e130786757aa7 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -88,7 +88,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 
     // 2) text ctrl
     m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
 
     // 2) text ctrl
     m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,

-                                wxDefaultPosition, wxSize(300, wxDefaultSize.y),
+                                wxDefaultPosition, wxSize(300, wxDefaultCoord),

                                 style & ~wxTextEntryDialogStyle);
     topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );
 
                                 style & ~wxTextEntryDialogStyle);
     topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );
 

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 2883e57b14994efd299b8febd30038635ed38798..4f7bb21448acad726a9b25367e3380767d483950 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -440,7 +440,7 @@ void wxTreeTextCtrl::OnKeyUp( wxKeyEvent &event )
             sx = parentSize.x - myPos.x;
         if (mySize.x > sx)
             sx = mySize.x;
             sx = parentSize.x - myPos.x;
         if (mySize.x > sx)
             sx = mySize.x;

-        SetSize(sx, wxDefaultSize.y);
+        SetSize(sx, wxDefaultCoord);

     }
 
     event.Skip();
     }
 
     event.Skip();

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index a020833ea2318d2dadaadbdbc4b16e14e4834813..bdc2edfa3ace5fee71f8c04073f96c361d5f11f0 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -283,7 +283,7 @@ void wxHtmlWordCell::Split(wxDC& dc,
     wxPoint pt1 = (selFrom == wxDefaultPosition) ?
                    wxDefaultPosition : selFrom - GetAbsPos();
     wxPoint pt2 = (selTo == wxDefaultPosition) ?
     wxPoint pt1 = (selFrom == wxDefaultPosition) ?
                    wxDefaultPosition : selFrom - GetAbsPos();
     wxPoint pt2 = (selTo == wxDefaultPosition) ?

-                   wxPoint(m_Width, wxDefaultPosition.y) : selTo - GetAbsPos();
+                   wxPoint(m_Width, wxDefaultCoord) : selTo - GetAbsPos();

 
     wxCoord charW, charH;
     unsigned len = m_Word.length();
 
     wxCoord charW, charH;
     unsigned len = m_Word.length();

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index da6aa40dc0bca4be23000d348f6f7c576938df99..9c7fc023ae166af6e9b882bdf57c7844cee84926 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -36,7 +36,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
 
     wxSize size = s ;
     /*
 
     wxSize size = s ;
     /*

-    if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
+    if ( size.x == wxDefaultCoord && size.y == wxDefaultCoord)

     {
         size = wxSize( 200 , 16 ) ;
     }
     {
         size = wxSize( 200 , 16 ) ;
     }

diff --git a/src/mac/classic/gauge.cpp b/src/mac/classic/gauge.cpp
index 01a557e17cc671672067b0ae1cb54ecf6771c735..b950e1b3bc825d0521d56061ec5719fcf7999ed4 100644 (file)
--- a/src/mac/classic/gauge.cpp
+++ b/src/mac/classic/gauge.cpp
@@ -38,7 +38,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
     m_rangeMax = range ;
     m_gaugePos = 0 ;
     
     m_rangeMax = range ;
     m_gaugePos = 0 ;
     

-    if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
+    if ( size.x == wxDefaultCoord && size.y == wxDefaultCoord)

     {
         size = wxSize( 200 , 16 ) ;
     }
     {
         size = wxSize( 200 , 16 ) ;
     }

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index fe05e3cbecf518ad8776e130cb9f3a8edb58f02a..07f324b547a109a243205c33027ca2efe7ad8e81 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1535,15 +1535,15 @@ void wxWindowMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         return;
     }
 
         return;
     }
 

-    if ( x == wxDefaultPosition.x && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+    if ( x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )

         x = currentX;
         x = currentX;

-    if ( y == wxDefaultPosition.y && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+    if ( y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )

         y = currentY;
 
     AdjustForParentClientOrigin(x, y, sizeFlags);
 
     wxSize size = wxDefaultSize;
         y = currentY;
 
     AdjustForParentClientOrigin(x, y, sizeFlags);
 
     wxSize size = wxDefaultSize;

-    if ( width == wxDefaultSize.x )
+    if ( width == wxDefaultCoord )

     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )
         {
     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )
         {


@@ -1557,11 +1557,11 @@ void wxWindowMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         }
     }
 
         }
     }
 

-    if ( height == wxDefaultSize.y )
+    if ( height == wxDefaultCoord )

     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
         {
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
         {

-            if ( size.x == wxDefaultSize.x )
+            if ( size.x == wxDefaultCoord )

             {
                 size = DoGetBestSize();
             }
             {
                 size = DoGetBestSize();
             }


@@ -1599,8 +1599,8 @@ void wxWindowMSW::DoSetClientSize(int width, int height)
         ::GetClientRect(GetHwnd(), &rectClient);
 
         // if the size is already ok, stop here (rectClient.left = top = 0)
         ::GetClientRect(GetHwnd(), &rectClient);
 
         // if the size is already ok, stop here (rectClient.left = top = 0)

-        if ( (rectClient.right == width || width == wxDefaultSize.x) &&
-             (rectClient.bottom == height || height == wxDefaultSize.y) )
+        if ( (rectClient.right == width || width == wxDefaultCoord) &&
+             (rectClient.bottom == height || height == wxDefaultCoord) )

         {
             break;
         }
         {
             break;
         }


@@ -3010,7 +3010,7 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
 
     bool nonDefault = false;
 
 
     bool nonDefault = false;
 

-    if ( pos.x == wxDefaultPosition.x )
+    if ( pos.x == wxDefaultCoord )

     {
         // if x is set to CW_USEDEFAULT, y parameter is ignored anyhow so we
         // can just as well set it to CW_USEDEFAULT as well
     {
         // if x is set to CW_USEDEFAULT, y parameter is ignored anyhow so we
         // can just as well set it to CW_USEDEFAULT as well


@@ -3023,7 +3023,7 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
         // neither because it is not handled as a special value by Windows then
         // and so we have to choose some default value for it
         x = pos.x;
         // neither because it is not handled as a special value by Windows then
         // and so we have to choose some default value for it
         x = pos.x;

-        y = pos.y == wxDefaultPosition.y ? DEFAULT_Y : pos.y;
+        y = pos.y == wxDefaultCoord ? DEFAULT_Y : pos.y;

 
         nonDefault = true;
     }
 
         nonDefault = true;
     }


@@ -3067,16 +3067,16 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
     // However, on PocketPC devices, we must use the default
     // size if possible.
 #ifdef _WIN32_WCE
     // However, on PocketPC devices, we must use the default
     // size if possible.
 #ifdef _WIN32_WCE

-    if (size.x == wxDefaultSize.x)
+    if (size.x == wxDefaultCoord)

         w = CW_USEDEFAULT;
     else
         w = size.x;
         w = CW_USEDEFAULT;
     else
         w = size.x;

-    if (size.y == wxDefaultSize.y)
+    if (size.y == wxDefaultCoord)

         h = CW_USEDEFAULT;
     else
         h = size.y;
 #else
         h = CW_USEDEFAULT;
     else
         h = size.y;
 #else

-    if ( size.x == wxDefaultSize.x || size.y == wxDefaultSize.y)
+    if ( size.x == wxDefaultCoord || size.y == wxDefaultCoord)

     {
         nonDefault = true;
     }
     {
         nonDefault = true;
     }


@@ -4191,25 +4191,25 @@ bool wxWindowMSW::HandleGetMinMaxInfo(void *mmInfo)
         maxWidth = GetMaxWidth(),
         maxHeight = GetMaxHeight();
 
         maxWidth = GetMaxWidth(),
         maxHeight = GetMaxHeight();
 

-    if ( minWidth != wxDefaultSize.x )
+    if ( minWidth != wxDefaultCoord )

     {
         info->ptMinTrackSize.x = minWidth;
         rc = true;
     }
 
     {
         info->ptMinTrackSize.x = minWidth;
         rc = true;
     }
 

-    if ( minHeight != wxDefaultSize.y )
+    if ( minHeight != wxDefaultCoord )

     {
         info->ptMinTrackSize.y = minHeight;
         rc = true;
     }
 
     {
         info->ptMinTrackSize.y = minHeight;
         rc = true;
     }
 

-    if ( maxWidth != wxDefaultSize.x )
+    if ( maxWidth != wxDefaultCoord )

     {
         info->ptMaxTrackSize.x = maxWidth;
         rc = true;
     }
 
     {
         info->ptMaxTrackSize.x = maxWidth;
         rc = true;
     }
 

-    if ( maxHeight != wxDefaultSize.y )
+    if ( maxHeight != wxDefaultCoord )

     {
         info->ptMaxTrackSize.y = maxHeight;
         rc = true;
     {
         info->ptMaxTrackSize.y = maxHeight;
         rc = true;

diff --git a/utils/configtool/src/configitemselector.cpp b/utils/configtool/src/configitemselector.cpp
index d406664e7a34a6bc7257fbeaea6847ac3a67054f..111a66c7a0d7466b70d84a575e926c30d83470bb 100644 (file)
--- a/utils/configtool/src/configitemselector.cpp
+++ b/utils/configtool/src/configitemselector.cpp
@@ -102,7 +102,7 @@ void ctConfigItemsSelector::CreateControls()
     item3->Add(item5, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
     wxString* item6Strings = NULL;
     item3->Add(item5, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
     wxString* item6Strings = NULL;

-    wxListBox* item6 = new wxListBox(item1, ID_AVAILABLE_CONFIG_ITEMS, wxDefaultPosition, wxSize(wxDefaultSize.x, 150), 0, item6Strings, wxLB_SINGLE|wxLB_SORT);
+    wxListBox* item6 = new wxListBox(item1, ID_AVAILABLE_CONFIG_ITEMS, wxDefaultPosition, wxSize(wxDefaultCoord, 150), 0, item6Strings, wxLB_SINGLE|wxLB_SORT);

     item3->Add(item6, 1, wxGROW|wxALL, 5);
 
     wxStaticText* item7 = new wxStaticText(item1, wxID_STATIC, _("&List of configuration items:"), wxDefaultPosition, wxDefaultSize, 0);
     item3->Add(item6, 1, wxGROW|wxALL, 5);
 
     wxStaticText* item7 = new wxStaticText(item1, wxID_STATIC, _("&List of configuration items:"), wxDefaultPosition, wxDefaultSize, 0);


@@ -112,7 +112,7 @@ void ctConfigItemsSelector::CreateControls()
     item3->Add(item8, 0, wxGROW, 5);
 
     wxString* item9Strings = NULL;
     item3->Add(item8, 0, wxGROW, 5);
 
     wxString* item9Strings = NULL;

-    wxListBox* item9 = new wxListBox(item1, ID_CONFIG_ITEMS, wxDefaultPosition, wxSize(wxDefaultSize.x, 100), 0, item9Strings, wxLB_SINGLE);
+    wxListBox* item9 = new wxListBox(item1, ID_CONFIG_ITEMS, wxDefaultPosition, wxSize(wxDefaultCoord, 100), 0, item9Strings, wxLB_SINGLE);

     item8->Add(item9, 1, wxGROW|wxALL, 5);
 
     wxBoxSizer* item10 = new wxBoxSizer(wxVERTICAL);
     item8->Add(item9, 1, wxGROW|wxALL, 5);
 
     wxBoxSizer* item10 = new wxBoxSizer(wxVERTICAL);

diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp
index d214233eb0aa5f922b553d35895d6f7af6d8d04a..4d5177ae38e8e81e2054e31d18298c3bbee39b88 100644 (file)
--- a/utils/configtool/src/mainframe.cpp
+++ b/utils/configtool/src/mainframe.cpp
@@ -248,22 +248,22 @@ void ctMainFrame::InitToolBar(wxToolBar* toolBar)
     toolBarBitmaps[12] = wxBitmap(help_xpm);
     toolBarBitmaps[13] = wxBitmap(helpcs_xpm);
 
     toolBarBitmaps[12] = wxBitmap(help_xpm);
     toolBarBitmaps[13] = wxBitmap(helpcs_xpm);
 

-    toolBar->AddTool(wxID_NEW, toolBarBitmaps[0], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL, wxT("New project"));
-    toolBar->AddTool(wxID_OPEN, toolBarBitmaps[1], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL, wxT("Open project"));
-    toolBar->AddTool(wxID_SAVE, toolBarBitmaps[2], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL, wxT("Save project"));
+    toolBar->AddTool(wxID_NEW, toolBarBitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, wxT("New project"));
+    toolBar->AddTool(wxID_OPEN, toolBarBitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, wxT("Open project"));
+    toolBar->AddTool(wxID_SAVE, toolBarBitmaps[2], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, wxT("Save project"));

 
     toolBar->AddSeparator();
 
     toolBar->AddSeparator();

-    toolBar->AddTool(wxID_CUT, toolBarBitmaps[4], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL, wxT("Cut"));
-    toolBar->AddTool(wxID_COPY, toolBarBitmaps[3], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL, wxT("Copy"));
-    toolBar->AddTool(wxID_PASTE, toolBarBitmaps[5], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL, wxT("Paste"));
+    toolBar->AddTool(wxID_CUT, toolBarBitmaps[4], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, wxT("Cut"));
+    toolBar->AddTool(wxID_COPY, toolBarBitmaps[3], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, wxT("Copy"));
+    toolBar->AddTool(wxID_PASTE, toolBarBitmaps[5], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, wxT("Paste"));

     toolBar->AddSeparator();
     toolBar->AddSeparator();

-    toolBar->AddTool(wxID_UNDO, toolBarBitmaps[10], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL, wxT("Undo"));
-    toolBar->AddTool(wxID_REDO, toolBarBitmaps[11], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL, wxT("Redo"));
+    toolBar->AddTool(wxID_UNDO, toolBarBitmaps[10], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, wxT("Undo"));
+    toolBar->AddTool(wxID_REDO, toolBarBitmaps[11], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, wxT("Redo"));

     toolBar->AddSeparator();
     toolBar->AddSeparator();

-    toolBar->AddTool(ctID_GO, toolBarBitmaps[6], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL, wxT("Save setup.h or configurewx.sh"));
+    toolBar->AddTool(ctID_GO, toolBarBitmaps[6], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, wxT("Save setup.h or configurewx.sh"));

     toolBar->AddSeparator();
     toolBar->AddSeparator();

-    toolBar->AddTool(ctID_ITEM_HELP, toolBarBitmaps[12], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL, wxT("Show help for this option"));
-    toolBar->AddTool(wxID_HELP_CONTEXT, toolBarBitmaps[13], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, (wxObject *) NULL, wxT("Show help on the clicked item"));
+    toolBar->AddTool(ctID_ITEM_HELP, toolBarBitmaps[12], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, wxT("Show help for this option"));
+    toolBar->AddTool(wxID_HELP_CONTEXT, toolBarBitmaps[13], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, wxT("Show help on the clicked item"));

 
     // after adding the buttons to the toolbar, must call Realize() to reflect
     // the changes
 
     // after adding the buttons to the toolbar, must call Realize() to reflect
     // the changes

diff --git a/utils/configtool/src/settingsdialog.cpp b/utils/configtool/src/settingsdialog.cpp
index c012726ac1bf2d8d9ff4df8a121c74abc2ae568b..2739518a7d3a941fa92bb864b353a7d824c4dd69 100644 (file)
--- a/utils/configtool/src/settingsdialog.cpp
+++ b/utils/configtool/src/settingsdialog.cpp
@@ -100,7 +100,7 @@ void ctSettingsDialog::CreateControls()
     item21->Add(item25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 #if defined(__WXGTK__) || defined(__WXMAC__)
     item21->Add(item25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 #if defined(__WXGTK__) || defined(__WXMAC__)

-    wxContextHelpButton* item26 = new wxContextHelpButton(item1, wxID_CONTEXT_HELP, wxDefaultPosition, wxSize(20, wxDefaultSize.y), wxBU_AUTODRAW);
+    wxContextHelpButton* item26 = new wxContextHelpButton(item1, wxID_CONTEXT_HELP, wxDefaultPosition, wxSize(20, wxDefaultCoord), wxBU_AUTODRAW);

     item21->Add(item26, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 #endif
 
     item21->Add(item26, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 #endif
 


@@ -239,7 +239,7 @@ void ctGeneralSettingsDialog::CreateControls()
         _("Setup file"),
         _("Configure script")
     };
         _("Setup file"),
         _("Configure script")
     };

-    wxChoice* item10 = new wxChoice(item4, ID_DEFAULT_FILE_KIND, wxDefaultPosition, wxSize(200, wxDefaultSize.y), 2, item10Strings, 0);
+    wxChoice* item10 = new wxChoice(item4, ID_DEFAULT_FILE_KIND, wxDefaultPosition, wxSize(200, wxDefaultCoord), 2, item10Strings, 0);

     item10->SetStringSelection(_("Setup file"));
     item10->SetHelpText(_("Select the default kind of file to save using Go"));
 #if wxUSE_TOOLTIPS
     item10->SetStringSelection(_("Setup file"));
     item10->SetHelpText(_("Select the default kind of file to save using Go"));
 #if wxUSE_TOOLTIPS


@@ -321,7 +321,7 @@ void ctLocationSettingsDialog::CreateControls()
     wxBoxSizer* item15 = new wxBoxSizer(wxHORIZONTAL);
     item13->Add(item15, 0, wxGROW, 5);
 
     wxBoxSizer* item15 = new wxBoxSizer(wxHORIZONTAL);
     item13->Add(item15, 0, wxGROW, 5);
 

-    wxTextCtrl* item16 = new wxTextCtrl(item11, ID_WXWIN_HIERARCHY, wxEmptyString, wxDefaultPosition, wxSize(200, wxDefaultSize.y), 0);
+    wxTextCtrl* item16 = new wxTextCtrl(item11, ID_WXWIN_HIERARCHY, wxEmptyString, wxDefaultPosition, wxSize(200, wxDefaultCoord), 0);

     item16->SetHelpText(_("Enter the root path of the wxWidgets hierarchy"));
 #if wxUSE_TOOLTIPS
     if (ShowToolTips())
     item16->SetHelpText(_("Enter the root path of the wxWidgets hierarchy"));
 #if wxUSE_TOOLTIPS
     if (ShowToolTips())