removed spurious #endif

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

diff --git a/src/os2/data.cpp b/src/os2/data.cpp
index 3b0395883ca6b579bdcd6c643906421daec91a73..28ba3f088491fd313225562b0c405877b61fb034 100644 (file)
--- a/src/os2/data.cpp
+++ b/src/os2/data.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        data.cpp
-// Purpose:     Various data
+// Purpose:     Various OS/2-specific global data
 // Author:      David Webster
 // Modified by:
 // Created:     09/20/99
@@ -16,126 +16,14 @@
 #include "wx/wx.h"
 #endif
 
-#include "wx/prntbase.h"
-
-#define _MAXPATHLEN 500
-
-// Useful buffer, initialized in wxCommonInit
-wxChar *wxBuffer = NULL;
-
-// Windows List
-wxWindowList wxTopLevelWindows;
-
-// List of windows pending deletion
-wxList WXDLLEXPORT wxPendingDelete;
+#include "wx/fontutil.h"
 
 // Current cursor, in order to hang on to
 // cursor handle when setting the cursor globally
 wxCursor *g_globalCursor = NULL;
 
-// Message Strings for Internationalization
-char **wx_msg_str = (char**)NULL;
-
-int wxPageNumber;
-
-// GDI Object Lists
-wxBrushList *wxTheBrushList = NULL;
-wxPenList   *wxThePenList = NULL;
-wxFontList   *wxTheFontList = NULL;
-wxBitmapList   *wxTheBitmapList = NULL;
-
-wxColourDatabase *wxTheColourDatabase = NULL;
-
-// Stock objects
-wxFont *wxNORMAL_FONT;
-wxFont *wxSMALL_FONT;
-wxFont *wxITALIC_FONT;
-wxFont *wxSWISS_FONT;
-wxPen *wxRED_PEN;
-
-wxPen *wxCYAN_PEN;
-wxPen *wxGREEN_PEN;
-wxPen *wxBLACK_PEN;
-wxPen *wxWHITE_PEN;
-wxPen *wxTRANSPARENT_PEN;
-wxPen *wxBLACK_DASHED_PEN;
-wxPen *wxGREY_PEN;
-wxPen *wxMEDIUM_GREY_PEN;
-wxPen *wxLIGHT_GREY_PEN;
-
-wxBrush *wxBLUE_BRUSH;
-wxBrush *wxGREEN_BRUSH;
-wxBrush *wxWHITE_BRUSH;
-wxBrush *wxBLACK_BRUSH;
-wxBrush *wxTRANSPARENT_BRUSH;
-wxBrush *wxCYAN_BRUSH;
-wxBrush *wxRED_BRUSH;
-wxBrush *wxGREY_BRUSH;
-wxBrush *wxMEDIUM_GREY_BRUSH;
-wxBrush *wxLIGHT_GREY_BRUSH;
-
-wxColour *wxBLACK;
-wxColour *wxWHITE;
-wxColour *wxRED;
-wxColour *wxBLUE;
-wxColour *wxGREEN;
-wxColour *wxCYAN;
-wxColour *wxLIGHT_GREY;
-
-wxCursor *wxSTANDARD_CURSOR = NULL;
-wxCursor *wxHOURGLASS_CURSOR = NULL;
-wxCursor *wxCROSS_CURSOR = NULL;
-
-// 'Null' objects
-wxAcceleratorTable wxNullAcceleratorTable;
-wxBitmap wxNullBitmap;
-wxIcon   wxNullIcon;
-wxCursor wxNullCursor;
-wxPen    wxNullPen;
-wxBrush  wxNullBrush;
-wxPalette wxNullPalette;
-wxFont   wxNullFont;
-wxColour wxNullColour;
 wxNativeFontInfo wxNullNativeFontInfo;
 
-//
-// Default window names
-//
-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*                       wxTreeCtrlNameStr                = wxT("treeCtrl");
-const wxChar*                       wxDirDialogNameStr               = wxT("wxDirCtrl");
-const wxChar*                       wxDirDialogDefaultFolderStr      = wxT("/");
-
 //
 // Class names
 //
@@ -150,12 +38,3 @@ const wxChar*                       wxPanelClassNameNR               = wxT("wxPa
 const wxChar*                       wxCanvasClassName                = wxT("wxCanvasClass");
 const wxChar*                       wxCanvasClassNameNR              = wxT("wxCanvasClassNR");
 
-// See wx/utils.h
-const wxChar *wxFloatToStringStr = wxT("%.2f");
-const wxChar *wxDoubleToStringStr = wxT("%.2f");
-
-const wxChar *wxUserResourceStr = wxT("TEXT");
-
-const wxSize wxDefaultSize(-1, -1);
-const wxPoint wxDefaultPosition(-1, -1);
-