Old API depreciated. Use of new API. Source cleaning.

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

diff --git a/samples/xrc/custclas.cpp b/samples/xrc/custclas.cpp
index 24669047db1ac178272b4e2236a5d9ecb31da3f1..a356a21c04eb74ff70aebaf94110a55ae70baa4b 100644 (file)
--- a/samples/xrc/custclas.cpp
+++ b/samples/xrc/custclas.cpp
@@ -143,7 +143,7 @@ void MyResizableListCtrl::SetColumnWidths()
     // Subtract width of other columns, scrollbar, and some padding
     leftmostColumnWidth -= GetColumnWidth( ACTION_COLUMN );
     leftmostColumnWidth -= GetColumnWidth( PRIORITY_COLUMN );
-    leftmostColumnWidth -= wxSystemSettings::GetSystemMetric( wxSYS_VSCROLL_X );
+    leftmostColumnWidth -= wxSystemSettings::GetMetric( wxSYS_VSCROLL_X );
     leftmostColumnWidth -= 5;
 
     // Set the column width to the new value.

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index b83a78ae327976cb1025e82ee23679c6fa8fe8f2..a74b5721cad60c4421f9028ef09d1c0f398b1f35 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -222,8 +222,8 @@ wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
                     0,GetCharHeight()
 #else
-                    GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
-                    GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL)
+                    ::GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
+                    ::GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL)
 #endif
     );
 

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 4dcd3e57f8851728bfecd1bacecb3ed00e21f27c..b56c1ef18ad5520811fe2c29692d8dddc1ddfd8f 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -301,8 +301,8 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
 #else
         if (!m_hCursorImageList)
         {
-            int cxCursor = GetSystemMetrics(SM_CXCURSOR);
-            int cyCursor = GetSystemMetrics(SM_CYCURSOR);
+            int cxCursor = ::GetSystemMetrics(SM_CXCURSOR);
+            int cyCursor = ::GetSystemMetrics(SM_CYCURSOR);
 
             m_hCursorImageList = (WXHIMAGELIST) ImageList_Create(cxCursor, cyCursor, ILC_MASK, 1, 1);
         }

diff --git a/src/msw/penwin.cpp b/src/msw/penwin.cpp
index 8a32c9f7084ebef85f08d32e309a8efc000e4600..ec3a6fccbb28c8fc66bbed2ad6882b385339d10f 100644 (file)
--- a/src/msw/penwin.cpp
+++ b/src/msw/penwin.cpp
@@ -62,7 +62,7 @@ void wxEnablePenAppHooks (bool hook)
       ///////////////////////////////////////////////////////////////////////
       // If running on a Pen Windows system, register this app so all
       // EDIT controls in dialogs are replaced by HEDIT controls.
-      if ((g_hPenWin = (HANDLE)GetSystemMetrics (SM_PENWINDOWS)) != (HANDLE) NULL)
+      if ((g_hPenWin = (HANDLE)::GetSystemMetrics (SM_PENWINDOWS)) != (HANDLE) NULL)
       {
         // We do this fancy GetProcAddress simply because we don't
         // know if we're running Pen Windows.
@@ -97,7 +97,7 @@ void wxRegisterPenWin(void)
 // (Notice the CONTROL statement in the RC file is "EDIT",
 // RegisterPenApp will automatically change that control to
 // an HEDIT.
-  if ((g_hPenWin = (HANDLE)GetSystemMetrics(SM_PENWINDOWS)) != (HANDLE)NULL) {
+  if ((g_hPenWin = (HANDLE)::GetSystemMetrics(SM_PENWINDOWS)) != (HANDLE)NULL) {
     // We do this fancy GetProcAddress simply because we don't
     // know if we're running Pen Windows.
    if ( (RegPenApp = (void (CALLBACK *)(WORD, BOOL))GetProcAddress(g_hPenWin, "RegisterPenApp"))!= NULL)

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 4e3e760cb19340873dde182d448497c49d5058d8..b4436ce624703893b8b7516b92d475db9d9cbbc8 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -260,7 +260,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 
     return *gs_fontDefault;
 #else // !__WXWINCE__
-    // wxWindow ctor calls GetSystemFont(wxSYS_DEFAULT_GUI_FONT) so we're
+    // wxWindow ctor calls GetFont(wxSYS_DEFAULT_GUI_FONT) so we're
     // called fairly often -- this is why we cache this particular font
     const bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT;
     if ( isDefaultRequested )

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index b74ae1f2ae25b524821af14eda8e738c48586c0d..3ce3398cb053dd0cf1731d5ca47d94dfd056c7fc 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -716,8 +716,8 @@ bool wxTreeCtrl::Create(wxWindow *parent,
         HDC hdcMem = CreateCompatibleDC(NULL);
 
         // create a mono bitmap of the standard size
-        int x = GetSystemMetrics(SM_CXMENUCHECK);
-        int y = GetSystemMetrics(SM_CYMENUCHECK);
+        int x = ::GetSystemMetrics(SM_CXMENUCHECK);
+        int y = ::GetSystemMetrics(SM_CYMENUCHECK);
         wxImageList imagelistCheckboxes(x, y, false, 2);
         HBITMAP hbmpCheck = CreateBitmap(x, y,   // bitmap size
                                          1,      // # of color planes
@@ -2225,7 +2225,7 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
         event.m_item = GetSelection();
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent( event );
-        
+
         return rc;
     }
 

diff --git a/utils/configtool/src/appsettings.cpp b/utils/configtool/src/appsettings.cpp
index 17f4a0f70b1be62b0493948f47e88bc85363ed87..19c0104dabc09e6a68aaad9823a61a6e6326092a 100644 (file)
--- a/utils/configtool/src/appsettings.cpp
+++ b/utils/configtool/src/appsettings.cpp
@@ -58,7 +58,7 @@ ctSettings::ctSettings()
 
     m_frameSize = wxRect(10, 10, 600, 500);
     // m_backgroundColour = wxColour(140, 172, 179); // blue-grey
-    m_editWindowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    m_editWindowFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
     m_appName = wxT("wxWidgets Configuration Tool");
     m_appNameShort = wxT("Configuration Tool");
@@ -123,7 +123,7 @@ void ctSettings::Copy (const ctSettings& settings)
 bool ctSettings::Init()
 {
     m_lastSetupSaveDir = wxEmptyString;
-    if (m_userName.IsEmpty())
+    if (m_userName.empty())
         m_userName = wxGetUserName();
 
     return true;
@@ -133,7 +133,7 @@ bool ctSettings::Init()
 wxString ctSettings::GenerateFilename(const wxString& rootName)
 {
     wxString path;
-    if (!m_lastFilename.IsEmpty())
+    if (!m_lastFilename.empty())
         path = wxPathOnly(m_lastFilename);
     else
         path = wxGetApp().GetAppDir();
@@ -196,7 +196,7 @@ bool ctSettings::LoadConfig()
 
     fontSpec = wxEmptyString;
     config.Read(wxT("Style/EditWindowFont"), & fontSpec);
-    if (!fontSpec.IsEmpty())
+    if (!fontSpec.empty())
         m_editWindowFont = apStringToFont(fontSpec);
 
     // Crash-resistance