X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acfd422afac254f4356904275656c0c15685fa1e..fd128b0c3ab84380d782e45bfa98f181a848df27:/src/gtk1/data.cpp diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp index b2fdae961c..60234d0fd6 100644 --- a/src/gtk1/data.cpp +++ b/src/gtk1/data.cpp @@ -18,6 +18,7 @@ #include "wx/dc.h" #include "wx/accel.h" #include "wx/dcps.h" +#include "wx/icon.h" #define _MAXPATHLEN 500 @@ -46,7 +47,7 @@ wxCriticalSection *wxPendingEventsLocker = NULL; /* Current cursor, in order to hang on to * cursor handle when setting the cursor globally */ -wxCursor *g_globalCursor = (wxCursor *) NULL; +wxCursor g_globalCursor; /* Don't allow event propagation during drag */ bool g_blockEventsOnDrag = FALSE; @@ -127,7 +128,10 @@ wxCursor *wxHOURGLASS_CURSOR = (wxCursor *) NULL; wxCursor *wxCROSS_CURSOR = (wxCursor *) NULL; /* 'Null' objects */ -wxAcceleratorTable wxNullAcceleratorTable; +#if wxUSE_ACCEL + wxAcceleratorTable wxNullAcceleratorTable; +#endif // wxUSE_ACCEL + wxBitmap wxNullBitmap; wxIcon wxNullIcon; wxCursor wxNullCursor;