call static functions directly

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

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 64051935b0a50c57b0c9e2cc2c221768a87c585f..24bee18da7051a64f5274f2725927feebbda48d2 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -3053,7 +3053,7 @@ static void wxConvertToMSWListCol(HWND hwndList,
 #ifdef NM_CUSTOMDRAW // _WIN32_IE >= 0x0300
     if ( item.m_mask & wxLIST_MASK_IMAGE )
     {
-        if ( wxTheApp->GetComCtl32Version() >= 470 )
+        if ( wxApp::GetComCtl32Version() >= 470 )
         {
             lvCol.mask |= LVCF_IMAGE;
 

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index d0253de614b5c2d42549466f3df5e99f72dee4fe..73395991b81a6e29c2948a9c7f22a3a0990f0b23 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -221,7 +221,7 @@ int wxSpinButton::GetValue() const
 {
     int n;
 #ifdef UDM_GETPOS32
-    if ( wxTheApp->GetComCtl32Version() >= 580 )
+    if ( wxApp::GetComCtl32Version() >= 580 )
     {
         // use the full 32 bit range if available
         n = ::SendMessage(GetHwnd(), UDM_GETPOS32, 0, 0);
@@ -244,7 +244,7 @@ void wxSpinButton::SetValue(int val)
     // wxSpinButtonBase::SetValue(val); -- no, it is pure virtual
 
 #ifdef UDM_SETPOS32
-    if ( wxTheApp->GetComCtl32Version() >= 580 )
+    if ( wxApp::GetComCtl32Version() >= 580 )
     {
         // use the full 32 bit range if available
         ::SendMessage(GetHwnd(), UDM_SETPOS32, 0, val);

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 16ccaa00b37a7d1979821f058d46092feaea8cde..606e581cd9c582beacdd432496151ed0632c75bb 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -509,7 +509,7 @@ void wxToolBar::CreateDisabledImageList()
 
     // as we can't use disabled image list with older versions of comctl32.dll,
     // don't even bother creating it
-    if ( wxTheApp->GetComCtl32Version() >= 470 )
+    if ( wxApp::GetComCtl32Version() >= 470 )
     {
         // search for the first disabled button img in the toolbar, if any
         for ( wxToolBarToolsList::compatibility_iterator

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index e6543e5bd1ebd2da9505a39b62b8554c021cd762..3559305bc5212f3727ad71471ea109a2c8d12fc9 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -4259,7 +4259,7 @@ void wxTextCtrl::CreateCaret()
         // FIXME use renderer
         caret = new wxCaret(this, 1, GetLineHeight());
 #ifndef __WXMSW__
-        caret->SetBlinkTime(0);
+        wxCaret::SetBlinkTime(0);
 #endif // __WXMSW__
     }
     else

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index bfcc9870fb2b2364a4bd293b4e938a69af65ba8d..11a647cdf84081749efbec10d05c0c34822abd4f 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -471,8 +471,7 @@ bool wxWindow::Enable(bool enable)
 
 bool wxWindow::IsFocused() const
 {
-    wxWindow *self = wxConstCast(this, wxWindow);
-    return self->FindFocus() == self;
+    return FindFocus() == this;
 }
 
 bool wxWindow::IsPressed() const