Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

call static functions directly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-05-06 16:57:00 +00:00
parent 53ee60908a
commit 5625d0d4ca
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/listctrl.cpp
View File

@@ -3053,7 +3053,7 @@ static void wxConvertToMSWListCol(HWND hwndList,
#ifdef NM_CUSTOMDRAW // _WIN32_IE >= 0x0300 #ifdef NM_CUSTOMDRAW // _WIN32_IE >= 0x0300
if ( item.m_mask & wxLIST_MASK_IMAGE ) if ( item.m_mask & wxLIST_MASK_IMAGE )
{ {
if ( wxTheApp->GetComCtl32Version() >= 470 ) if ( wxApp::GetComCtl32Version() >= 470 )
{ {
lvCol.mask |= LVCF_IMAGE; lvCol.mask |= LVCF_IMAGE;

4
src/msw/spinbutt.cpp
View File

@@ -221,7 +221,7 @@ int wxSpinButton::GetValue() const
{ {
int n; int n;
#ifdef UDM_GETPOS32 #ifdef UDM_GETPOS32
if ( wxTheApp->GetComCtl32Version() >= 580 ) if ( wxApp::GetComCtl32Version() >= 580 )
{ {
// use the full 32 bit range if available // use the full 32 bit range if available
n = ::SendMessage(GetHwnd(), UDM_GETPOS32, 0, 0); n = ::SendMessage(GetHwnd(), UDM_GETPOS32, 0, 0);
@@ -244,7 +244,7 @@ void wxSpinButton::SetValue(int val)
// wxSpinButtonBase::SetValue(val); -- no, it is pure virtual // wxSpinButtonBase::SetValue(val); -- no, it is pure virtual
#ifdef UDM_SETPOS32 #ifdef UDM_SETPOS32
if ( wxTheApp->GetComCtl32Version() >= 580 ) if ( wxApp::GetComCtl32Version() >= 580 )
{ {
// use the full 32 bit range if available // use the full 32 bit range if available
::SendMessage(GetHwnd(), UDM_SETPOS32, 0, val); ::SendMessage(GetHwnd(), UDM_SETPOS32, 0, val);

2
src/msw/tbar95.cpp
View File

@@ -509,7 +509,7 @@ void wxToolBar::CreateDisabledImageList()
// as we can't use disabled image list with older versions of comctl32.dll, // as we can't use disabled image list with older versions of comctl32.dll,
// don't even bother creating it // 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 // search for the first disabled button img in the toolbar, if any
for ( wxToolBarToolsList::compatibility_iterator for ( wxToolBarToolsList::compatibility_iterator

2
src/univ/textctrl.cpp
View File

@@ -4259,7 +4259,7 @@ void wxTextCtrl::CreateCaret()
// FIXME use renderer // FIXME use renderer
caret = new wxCaret(this, 1, GetLineHeight()); caret = new wxCaret(this, 1, GetLineHeight());
#ifndef __WXMSW__ #ifndef __WXMSW__
caret->SetBlinkTime(0); wxCaret::SetBlinkTime(0);
#endif // __WXMSW__ #endif // __WXMSW__
} }
else else

3
src/univ/winuniv.cpp
View File

@@ -471,8 +471,7 @@ bool wxWindow::Enable(bool enable)
bool wxWindow::IsFocused() const bool wxWindow::IsFocused() const
{ {
wxWindow *self = wxConstCast(this, wxWindow); return FindFocus() == this;
return self->FindFocus() == self;
} }
bool wxWindow::IsPressed() const bool wxWindow::IsPressed() const