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

fix incorrect tests of wxUSE_ macros

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-03-08 16:45:17 +00:00
parent 6fc8ad6d53
commit 32b183b578
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/tipwin.cpp
View File

@@ -167,7 +167,7 @@ wxTipWindow::~wxTipWindow()
{ {
*m_windowPtr = NULL; *m_windowPtr = NULL;
} }
#ifdef wxUSE_POPUPWIN #if wxUSE_POPUPWIN
#ifdef __WXGTK__ #ifdef __WXGTK__
if ( m_view->HasCapture() ) if ( m_view->HasCapture() )
m_view->ReleaseMouse(); m_view->ReleaseMouse();

2
src/osx/cocoa/window.mm
View File

@@ -931,7 +931,7 @@ void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect)
if (impl == NULL) if (impl == NULL)
return; return;
#ifdef wxUSE_THREADS #if wxUSE_THREADS
// OS X starts a NSUIHeartBeatThread for animating the default button in a // OS X starts a NSUIHeartBeatThread for animating the default button in a
// dialog. This causes a drawRect of the active dialog from outside the // dialog. This causes a drawRect of the active dialog from outside the
// main UI thread. This causes an occasional crash since the wx drawing // main UI thread. This causes an occasional crash since the wx drawing

2
src/univ/themes/gtk.cpp
View File

@@ -57,9 +57,7 @@
#include "wx/notebook.h" #include "wx/notebook.h"
#include "wx/spinbutt.h" #include "wx/spinbutt.h"
#include "wx/artprov.h" #include "wx/artprov.h"
#ifdef wxUSE_TOGGLEBTN
#include "wx/tglbtn.h" #include "wx/tglbtn.h"
#endif // wxUSE_TOGGLEBTN
#include "wx/univ/stdrend.h" #include "wx/univ/stdrend.h"
#include "wx/univ/inpcons.h" #include "wx/univ/inpcons.h"

2
src/univ/themes/win32.cpp
View File

@@ -61,9 +61,7 @@
#include "wx/notebook.h" #include "wx/notebook.h"
#include "wx/spinbutt.h" #include "wx/spinbutt.h"
#include "wx/artprov.h" #include "wx/artprov.h"
#ifdef wxUSE_TOGGLEBTN
#include "wx/tglbtn.h" #include "wx/tglbtn.h"
#endif // wxUSE_TOGGLEBTN
#include "wx/univ/scrtimer.h" #include "wx/univ/scrtimer.h"
#include "wx/univ/stdrend.h" #include "wx/univ/stdrend.h"