compilation fixes - wxGTK compiles but not links

[wxWidgets.git] / src / msw / data.cpp

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index e9e1c75c78e729a2469f14a601606cebdf78d386..7e863a33d30bd2473e9892f661567e5287ed6b9f 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -87,7 +87,10 @@ wxCursor *wxHOURGLASS_CURSOR = NULL;
 wxCursor *wxCROSS_CURSOR = NULL;
 
 // 'Null' objects
 wxCursor *wxCROSS_CURSOR = NULL;
 
 // 'Null' objects

+#if wxUSE_ACCEL

 wxAcceleratorTable wxNullAcceleratorTable;
 wxAcceleratorTable wxNullAcceleratorTable;

+#endif // wxUSE_ACCEL
+

 wxBitmap  wxNullBitmap;
 wxIcon    wxNullIcon;
 wxCursor  wxNullCursor;
 wxBitmap  wxNullBitmap;
 wxIcon    wxNullIcon;
 wxCursor  wxNullCursor;


@@ -96,7 +99,6 @@ wxBrush   wxNullBrush;
 wxPalette wxNullPalette;
 wxFont    wxNullFont;
 wxColour  wxNullColour;
 wxPalette wxNullPalette;
 wxFont    wxNullFont;
 wxColour  wxNullColour;

-wxNativeFontInfo wxNullNativeFontInfo;

 
 // Default window names
 const wxChar *wxControlNameStr = wxT("control");
 
 // Default window names
 const wxChar *wxControlNameStr = wxT("control");