Various cleanings.

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 6399b743d2f198cb502bdc61a8b6b7ef9061edf9..81d0cecc085c831762d7770cb2227a7e5082d5fe 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -1523,7 +1523,7 @@ public:
                     int joystick = wxJOYSTICK1,
                     int change = 0)
         : wxEvent(0, type),
-          m_pos(0, 0),
+          m_pos(),
           m_zPosition(0),
           m_buttonChange(change),
           m_buttonState(state),

diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h
index 1e6ece736ca07668b019126e1d0f2bb24f3c5db7..78e62fc1ed6ee0ef1b90914222fc99b81f042c85 100644 (file)
--- a/include/wx/mediactrl.h
+++ b/include/wx/mediactrl.h
@@ -113,11 +113,11 @@ public:
     {                                                                   }
 
     wxMediaCtrl(wxWindow* parent, wxWindowID winid,
-                const wxString& fileName = wxT(""),
+                const wxString& fileName = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& szBackend = wxT(""),
+                const wxString& szBackend = wxEmptyString,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxT("mediaCtrl"))
                 : m_imp(NULL), m_bLoaded(false), m_bLoop(false)
@@ -129,7 +129,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& szBackend = wxT(""),
+                const wxString& szBackend = wxEmptyString,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxT("mediaCtrl"))
                 : m_imp(NULL), m_bLoop(false)
@@ -139,11 +139,11 @@ public:
     ~wxMediaCtrl();
 
     bool Create(wxWindow* parent, wxWindowID winid,
-                const wxString& fileName = wxT(""),
+                const wxString& fileName = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& szBackend = wxT(""),
+                const wxString& szBackend = wxEmptyString,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxT("mediaCtrl"));
 
@@ -152,7 +152,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& szBackend = wxT(""),
+                const wxString& szBackend = wxEmptyString,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxT("mediaCtrl")); //DirectShow only
 
@@ -252,7 +252,7 @@ public:
                       int WXUNUSED(w), int WXUNUSED(h))
     {                                   }
     virtual wxSize GetVideoSize() const
-    {   return wxSize(0,0);             }
+    {   return wxSize();                }
 
     virtual double GetPlaybackRate()
     {   return 0.0;                     }

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 0f8ac848766b478deecf34b787ac25a534217c16..f3ffe0ebd39bb2ba403d182394934ff5e30b1209 100644 (file)
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -169,7 +169,7 @@ void wxClientDC::InitDC()
     }
 
     // clip the DC to avoid overwriting the non client area
-    SetClippingRegion(wxPoint(0, 0), m_canvas->GetClientSize());
+    SetClippingRegion(wxPoint(), m_canvas->GetClientSize());
 #endif // __WXUNIVERSAL__ || __WXWINCE__
 }
 

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index b18902071fb5c954f1cf150c0bba17583546de66..6c47dc906f0da735ce11824d0b1a91541b93f46a 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -108,8 +108,8 @@ public:
     // constructors
     wxFontRefData()
     {
-        Init(-1, wxSize(0, 0), FALSE, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
-             wxFONTWEIGHT_NORMAL, FALSE, wxEmptyString,
+        Init(-1, wxSize(), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+             wxFONTWEIGHT_NORMAL, false, wxEmptyString,
              wxFONTENCODING_DEFAULT);
     }
 
@@ -223,7 +223,7 @@ public:
         else
         {
             m_pointSize = pointSize;
-            m_sizeUsingPixels = FALSE;
+            m_sizeUsingPixels = false;
         }
     }
 
@@ -236,7 +236,7 @@ public:
         else
         {
             m_pixelSize = pixelSize;
-            m_sizeUsingPixels = TRUE;
+            m_sizeUsingPixels = true;
         }
     }
 

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 5ffab12251683f190b8bd519c0d78d0ef2c33813..46a76667943cc597bd6a05d3fee9d412963530e8 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -87,7 +87,7 @@ wxPoint wxJoystick::GetPosition() const
     if (res == JOYERR_NOERROR )
         return wxPoint(joyInfo.wXpos, joyInfo.wYpos);
     else
-        return wxPoint(0, 0);
+        return wxPoint();
 }
 
 int wxJoystick::GetZPosition() const

diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index f0fbf91a47eae35ff04f4b0f49127496d4a94b89..526ca577e9a58330921ccb5ae476c523b57730e4 100644 (file)
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -1176,7 +1176,7 @@ wxSize wxMCIMediaBackend::GetVideoSize() const
 
         return wxSize(whereParms.rc.right, whereParms.rc.bottom);
     }
-    return wxSize(0,0);
+    return wxSize();
 }
 
 //---------------------------------------------------------------------------
@@ -1619,7 +1619,7 @@ bool wxQTMediaBackend::SetPosition(wxLongLong where)
 // wxQTMediaBackend::GetPosition
 //
 // 1) Calls GetMovieTime to get the position we are in in the movie
-// in milliseconds (we called 
+// in milliseconds (we called
 //---------------------------------------------------------------------------
 wxLongLong wxQTMediaBackend::GetPosition()
 {

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index a7eea971690ba1d1cd1567171051a937fccbbce5..db34763fd59b50369e785a359faf17b0de83b61a 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -480,7 +480,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
     wxSize sizeTotal = sizePage;
 
     // We need to make getting tab size part of the wxWidgets API.
-    wxSize tabSize(0, 0);
+    wxSize tabSize;
     if (GetPageCount() > 0)
     {
         RECT rect;
@@ -627,7 +627,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     }
 
     // and the text
-    if ( !strText.IsEmpty() )
+    if ( !strText.empty() )
     {
         tcItem.mask |= TCIF_TEXT;
         tcItem.pszText = (wxChar *)strText.c_str(); // const_cast

diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 56e9af2adb0e32b1be4501addf556e2d6f74306a..3b01b5b5b14205d48b31250c083dc0e5379ca18b 100644 (file)
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -215,7 +215,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
                     // Shouldn't really get here
                     wxFAIL_MSG(wxT("Couldn't find paper size in paper database."));
                     data.SetPaperId( wxPAPER_NONE );
-                    data.SetPaperSize( wxSize(0,0) );
+                    data.SetPaperSize( wxSize() );
                 }
             }
             else
@@ -223,7 +223,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
                 // Shouldn't really get here
                 wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
                 data.SetPaperId( wxPAPER_NONE );
-                data.SetPaperSize( wxSize(0,0) );
+                data.SetPaperSize( wxSize() );
             }
         }
         else if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
@@ -237,7 +237,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
             // Shouldn't really get here
             wxFAIL_MSG(wxT("Couldn't find paper size from DEVMODE."));
             data.SetPaperId( wxPAPER_NONE );
-            data.SetPaperSize( wxSize(0,0) );
+            data.SetPaperSize( wxSize() );
         }
 
         //// Duplex

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 53d205ed73934ad9ac643d985baeb76ffd711728..a9161772483a84b5eaf4cb70920e698081d30d3d 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -2903,7 +2903,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 wxASSERT_MSG( !m_dragImage, _T("starting to drag once again?") );
 
                 m_dragImage = new wxDragImage(*this, event.m_item);
-                m_dragImage->BeginDrag(wxPoint(0, 0), this);
+                m_dragImage->BeginDrag(wxPoint(), this);
                 m_dragImage->Show();
             }
             break;

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index dc99d7cf4d1f73937aa08ca6a647f0851c5bce96..7d7bdf9bddb01c7176a625dfea5f4f7450a4ae6c 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -306,9 +306,9 @@ wxBEGIN_PROPERTIES_TABLE(wxWindow)
     wxPROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
 #if 0
     // possible property candidates (not in xrc) or not valid in all subclasses
-    wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxT("") )
+    wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxEmptyString )
     wxPROPERTY( Font , wxFont , SetFont , GetWindowFont  , )
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxT("") )
+    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString )
     // MaxHeight, Width , MinHeight , Width
     // TODO switch label to control and title to toplevels
 
@@ -2781,7 +2781,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
                         wxHelpEvent helpEvent(wxEVT_HELP,
                                               subjectOfHelp->GetId(),
 #ifdef __WXWINCE__
-                                              wxPoint(0, 0)
+                                              wxPoint()
 #else
                                               wxPoint(info->MousePos.x, info->MousePos.y)
 #endif

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 1a544c825e383b56fe776e9808280b04fa2992ad..a5fefdfa0e5349a2b7e1472e03bd3215e6c28805 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -328,7 +328,7 @@ void wxComboControl::DoMoveWindow(int x, int y, int width, int height)
     wxSize sizeBtn = m_btn->GetBestSize();
 
     wxCoord wText = width - sizeBtn.x;
-    wxPoint p = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
+    wxPoint p = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint();
     m_text->SetSize(x - p.x, y - p.y, wText, height);
     m_btn->SetSize(x - p.x + wText, y - p.y, sizeBtn.x, height);
 }

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 9b682f1b2510466760fafd26bacdc10a31988aa4..6fe24d28e97185e8c2c6ad08da56a74eb5dd2fa3 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -2515,7 +2515,7 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 
     // wxLogDebug( "Name of invoking window %s", menu->GetInvokingWindow()->GetName().c_str() );
 
-    menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize(0, 0));
+    menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize());
 
     // this is not very useful if the menu was popped up because of the mouse
     // click but I think it is nice to do when it appears because of a key

diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index f480c05b5699b233faf995d8ac59960efa6af754..2b9e19f9ffc4e9bb1f903782ed41a8eeaf0c988d 100644 (file)
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -1253,7 +1253,7 @@ void wxNotebook::ScrollLastTo(int page)
 wxSize wxNotebook::DoGetBestClientSize() const
 {
     // calculate the max page size
-    wxSize size(0, 0);
+    wxSize size;
 
     size_t count = GetPageCount();
     if ( count )

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 6637727315c0d2b3cd23dd45470078dfe404533c..9fadd8eb266c44ebdcf72dd0a2c1f31b01a3c3c7 100644 (file)
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -445,7 +445,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
 
     wxSize sizeBtn = GetMaxButtonSize();
     wxPoint ptOrigin = GetBoxAreaOrigin();
-    wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
+    wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint();
 
     x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x;
     y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;

diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index ecfebabec1edf2e1a81111ca285cc7f6ef59e25c..02019feee6d2d938d58a0270f64ebf6342c70298 100644 (file)
--- a/src/univ/themes/gtk.cpp
+++ b/src/univ/themes/gtk.cpp
@@ -449,7 +449,7 @@ protected:
                         const wxString& label,
                         int flags,
                         int indexAccel,
-                        const wxString& accel = _T(""),
+                        const wxString& accel = wxEmptyString,
                         const wxBitmap& bitmap = wxNullBitmap,
                         const wxGTKMenuGeometryInfo *geometryInfo = NULL);
 
@@ -1334,7 +1334,7 @@ void wxGTKRenderer::DrawCheckItem(wxDC& dc,
     rectBitmap.width = GetCheckBitmapSize().x;
 
     // never draw the focus rect around the check indicators here
-    DrawCheckButton(dc, _T(""), bitmap, rectBitmap, flags & ~wxCONTROL_FOCUSED);
+    DrawCheckButton(dc, wxEmptyString, bitmap, rectBitmap, flags & ~wxCONTROL_FOCUSED);
 
     wxRect rectLabel = rect;
     wxCoord shift = rectBitmap.width + 2*GetCheckItemMargin();
@@ -2326,7 +2326,7 @@ wxMenuGeometryInfo *wxGTKRenderer::GetMenuGeometry(wxWindow *win,
 wxSize
 wxGTKRenderer::GetStatusBarBorders(wxCoord * WXUNUSED(borderBetweenFields)) const
 {
-    return wxSize(0, 0);
+    return wxSize();
 }
 
 void wxGTKRenderer::DrawStatusField(wxDC& WXUNUSED(dc),
@@ -2913,7 +2913,7 @@ wxGTKRenderer::GetFrameTotalSize(const wxSize& clientSize,
 
 wxSize wxGTKRenderer::GetFrameMinSize(int WXUNUSED(flags)) const
 {
-    return wxSize(0,0);
+    return wxSize();
 }
 
 wxSize wxGTKRenderer::GetFrameIconSize() const

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index f3ff3b79e5246f2a5af9abc7767200358a59e2af..0984602d1245171aa8faa15381f74e2c7f1c5d1d 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -3932,7 +3932,7 @@ wxSize wxWin32Renderer::GetFrameTotalSize(const wxSize& clientSize,
 
 wxSize wxWin32Renderer::GetFrameMinSize(int flags) const
 {
-    wxSize s(0, 0);
+    wxSize s;
 
     if ( (flags & wxTOPLEVEL_BORDER) && !(flags & wxTOPLEVEL_MAXIMIZED) )
     {

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 6d57da70e001562d0e55820dcea6294d8c35ac07..4e38559a5df412ba6353a289a15199e7686b3dd1 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -1112,12 +1112,12 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
         wxMemoryDC dcMem;
         dcMem.SelectObject(bmp);
 
-        dcMem.Blit(wxPoint(0, 0), size, &dc, ptSource
+        dcMem.Blit(wxPoint(), size, &dc, ptSource
 #if defined(__WXGTK__) && !defined(wxHAS_WORKING_GTK_DC_BLIT)
                 + GetClientAreaOrigin()
 #endif // broken wxGTK wxDC::Blit
                   );
-        dc.Blit(ptDest, size, &dcMem, wxPoint(0, 0));
+        dc.Blit(ptDest, size, &dcMem, wxPoint());
 
         wxLogTrace(_T("scroll"),
                    _T("Blit: (%d, %d) of size %dx%d -> (%d, %d)"),