Remove unnecessary header dependencies. Fix resulting compilation

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

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index 1b24fc3e3a7c20c905dc1ead6487c9ef765aa2ae..65120bb896a01af7e2de9f66463a6636939e53a9 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
+#include "wx/treectrl.h"
 #endif
 
 #include "wx/prntbase.h"
@@ -37,20 +38,13 @@ wxWindowList wxTopLevelWindows;
 // List of windows pending deletion
 wxList WXDLLEXPORT wxPendingDelete;
 
-// Custom OS version, as optionally placed in wx.ini/.wxrc
-// Currently this can be Win95, Windows, Win32s, WinNT.
-// For some systems, you can't tell until run-time what services you
-// have. See wxGetOsVersion, which uses this string if present.
-char *wxOsVersion = NULL;
-
 int wxPageNumber;
 
 // GDI Object Lists
-wxBrushList *wxTheBrushList = NULL;
-wxPenList   *wxThePenList = NULL;
 wxFontList   *wxTheFontList = NULL;
-wxBitmapList   *wxTheBitmapList = NULL;
-
+wxPenList    *wxThePenList = NULL;
+wxBrushList  *wxTheBrushList = NULL;
+wxBitmapList *wxTheBitmapList = NULL;
 wxColourDatabase *wxTheColourDatabase = NULL;
 
 // Stock objects
@@ -58,8 +52,8 @@ wxFont *wxNORMAL_FONT;
 wxFont *wxSMALL_FONT;
 wxFont *wxITALIC_FONT;
 wxFont *wxSWISS_FONT;
-wxPen *wxRED_PEN;
 
+wxPen *wxRED_PEN;
 wxPen *wxCYAN_PEN;
 wxPen *wxGREEN_PEN;
 wxPen *wxBLACK_PEN;
@@ -94,61 +88,64 @@ wxCursor *wxHOURGLASS_CURSOR = NULL;
 wxCursor *wxCROSS_CURSOR = NULL;
 
 // 'Null' objects
+#if wxUSE_ACCEL
 wxAcceleratorTable wxNullAcceleratorTable;
-wxBitmap wxNullBitmap;
-wxIcon   wxNullIcon;
-wxCursor wxNullCursor;
-wxPen    wxNullPen;
-wxBrush  wxNullBrush;
+#endif // wxUSE_ACCEL
+
+wxBitmap  wxNullBitmap;
+wxIcon    wxNullIcon;
+wxCursor  wxNullCursor;
+wxPen     wxNullPen;
+wxBrush   wxNullBrush;
+#if wxUSE_PALETTE
 wxPalette wxNullPalette;
-wxFont   wxNullFont;
-wxColour wxNullColour;
+#endif // wxUSE_PALETTE
+wxFont    wxNullFont;
+wxColour  wxNullColour;
 
 // Default window names
-const wxChar *wxControlNameStr = wxT("control");
-const wxChar *wxButtonNameStr = wxT("button");
-const wxChar *wxCanvasNameStr = wxT("canvas");
-const wxChar *wxCheckBoxNameStr = wxT("check");
-const wxChar *wxChoiceNameStr = wxT("choice");
-const wxChar *wxComboBoxNameStr = wxT("comboBox");
-const wxChar *wxDialogNameStr = wxT("dialog");
-const wxChar *wxFrameNameStr = wxT("frame");
-const wxChar *wxGaugeNameStr = wxT("gauge");
-const wxChar *wxStaticBoxNameStr = wxT("groupBox");
-const wxChar *wxListBoxNameStr = wxT("listBox");
-const wxChar *wxStaticTextNameStr = wxT("message");
-const wxChar *wxStaticBitmapNameStr = wxT("message");
-const wxChar *wxMultiTextNameStr = wxT("multitext");
-const wxChar *wxPanelNameStr = wxT("panel");
-const wxChar *wxRadioBoxNameStr = wxT("radioBox");
-const wxChar *wxRadioButtonNameStr = wxT("radioButton");
-const wxChar *wxBitmapRadioButtonNameStr = wxT("radioButton");
-const wxChar *wxScrollBarNameStr = wxT("scrollBar");
-const wxChar *wxSliderNameStr = wxT("slider");
-const wxChar *wxStaticNameStr = wxT("static");
-const wxChar *wxTextCtrlWindowNameStr = wxT("textWindow");
-const wxChar *wxTextCtrlNameStr = wxT("text");
-const wxChar *wxVirtListBoxNameStr = wxT("virtListBox");
-const wxChar *wxButtonBarNameStr = wxT("buttonbar");
-const wxChar *wxEnhDialogNameStr = wxT("Shell");
-const wxChar *wxToolBarNameStr = wxT("toolbar");
-const wxChar *wxStatusLineNameStr = wxT("status_line");
-const wxChar *wxGetTextFromUserPromptStr = wxT("Input Text");
-const wxChar *wxMessageBoxCaptionStr = wxT("Message");
-const wxChar *wxFileSelectorPromptStr = wxT("Select a file");
-const wxChar *wxFileSelectorDefaultWildcardStr = wxT("*.*");
-const wxChar *wxInternalErrorStr = wxT("wxWindows Internal Error");
-const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error");
-const wxChar *wxTreeCtrlNameStr = wxT("treeCtrl");
-const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
-const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
+WXDLLEXPORT_DATA(const wxChar *) wxControlNameStr = wxT("control");
+WXDLLEXPORT_DATA(const wxChar *) wxButtonNameStr = wxT("button");
+WXDLLEXPORT_DATA(const wxChar *) wxCanvasNameStr = wxT("canvas");
+WXDLLEXPORT_DATA(const wxChar *) wxCheckBoxNameStr = wxT("check");
+WXDLLEXPORT_DATA(const wxChar *) wxChoiceNameStr = wxT("choice");
+WXDLLEXPORT_DATA(const wxChar *) wxComboBoxNameStr = wxT("comboBox");
+WXDLLEXPORT_DATA(const wxChar *) wxDialogNameStr = wxT("dialog");
+WXDLLEXPORT_DATA(const wxChar *) wxFrameNameStr = wxT("frame");
+WXDLLEXPORT_DATA(const wxChar *) wxGaugeNameStr = wxT("gauge");
+WXDLLEXPORT_DATA(const wxChar *) wxStaticBoxNameStr = wxT("groupBox");
+WXDLLEXPORT_DATA(const wxChar *) wxListBoxNameStr = wxT("listBox");
+WXDLLEXPORT_DATA(const wxChar *) wxStaticTextNameStr = wxT("message");
+WXDLLEXPORT_DATA(const wxChar *) wxStaticBitmapNameStr = wxT("message");
+WXDLLEXPORT_DATA(const wxChar *) wxMultiTextNameStr = wxT("multitext");
+WXDLLEXPORT_DATA(const wxChar *) wxPanelNameStr = wxT("panel");
+WXDLLEXPORT_DATA(const wxChar *) wxRadioBoxNameStr = wxT("radioBox");
+WXDLLEXPORT_DATA(const wxChar *) wxRadioButtonNameStr = wxT("radioButton");
+WXDLLEXPORT_DATA(const wxChar *) wxBitmapRadioButtonNameStr = wxT("radioButton");
+WXDLLEXPORT_DATA(const wxChar *) wxScrollBarNameStr = wxT("scrollBar");
+WXDLLEXPORT_DATA(const wxChar *) wxSliderNameStr = wxT("slider");
+WXDLLEXPORT_DATA(const wxChar *) wxStaticNameStr = wxT("static");
+WXDLLEXPORT_DATA(const wxChar *) wxTextCtrlWindowNameStr = wxT("textWindow");
+WXDLLEXPORT_DATA(const wxChar *) wxTextCtrlNameStr = wxT("text");
+WXDLLEXPORT_DATA(const wxChar *) wxVirtListBoxNameStr = wxT("virtListBox");
+WXDLLEXPORT_DATA(const wxChar *) wxButtonBarNameStr = wxT("buttonbar");
+WXDLLEXPORT_DATA(const wxChar *) wxEnhDialogNameStr = wxT("Shell");
+WXDLLEXPORT_DATA(const wxChar *) wxToolBarNameStr = wxT("toolbar");
+WXDLLEXPORT_DATA(const wxChar *) wxStatusLineNameStr = wxT("status_line");
+WXDLLEXPORT_DATA(const wxChar *) wxGetTextFromUserPromptStr = wxT("Input Text");
+WXDLLEXPORT_DATA(const wxChar *) wxMessageBoxCaptionStr = wxT("Message");
+WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorPromptStr = wxT("Select a file");
+WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr = wxT("*.*");
+WXDLLEXPORT_DATA(const wxChar *) wxTreeCtrlNameStr = wxT("treeCtrl");
+WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl");
+WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/");
 
 // See wx/utils.h
-const wxChar *wxFloatToStringStr = wxT("%.2f");
-const wxChar *wxDoubleToStringStr = wxT("%.2f");
+WXDLLEXPORT_DATA(const wxChar *) wxFloatToStringStr = wxT("%.2f");
+WXDLLEXPORT_DATA(const wxChar *) wxDoubleToStringStr = wxT("%.2f");
 
 #ifdef __WXMSW__
-const wxChar *wxUserResourceStr = wxT("TEXT");
+WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
 #endif