Fixed out by one error

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

diff --git a/src/mgl/data.cpp b/src/mgl/data.cpp
index bd9a78ccd5fbbd7b74a917ee641af197c0da8bc4..7e15d92ce37f4a16c453b39bb5b4e13c8a812e8a 100644 (file)
--- a/src/mgl/data.cpp
+++ b/src/mgl/data.cpp
@@ -1,42 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        data.cpp
-// Purpose:     wxMGL data
+// Name:        mgl/data.cpp
+// Purpose:     wxMGL-specific global data
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-// #pragma implementation
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
 #include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/window.h"
-#include "wx/dc.h"
-
-#if wxUSE_ACCEL
-#include "wx/accel.h"
-#endif
-
-#include "wx/dcps.h"
-#include "wx/icon.h"
-
-#define _MAXPATHLEN 500
-
-/* Windows List */
-wxWindowList wxTopLevelWindows;
-
-/* List of windows pending deletion */
-wxList wxPendingDelete;
+#include "wx/cursor.h"
 
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
@@ -55,119 +27,3 @@ int g_openDialogs = 0;
    FALSE by all event callbacks before anything else is done */
 bool g_isIdle = FALSE;
 
-/* Message Strings for Internationalization */
-char **wx_msg_str = (char**)NULL;
-
-/* For printing several pages */
-int wxPageNumber;
-
-// Now in prntbase.cpp
-// wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase *) NULL;
-
-/* GDI Object Lists */
-wxBrushList      *wxTheBrushList = (wxBrushList *) NULL;
-wxPenList        *wxThePenList = (wxPenList *) NULL;
-wxFontList       *wxTheFontList = (wxFontList *) NULL;
-wxColourDatabase *wxTheColourDatabase = (wxColourDatabase *) NULL;
-wxBitmapList     *wxTheBitmapList = (wxBitmapList *) NULL;
-
-/* X only font names */
-/*
-wxFontNameDirectory *wxTheFontNameDirectory;
-*/
-
-/* 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 *wxGREY;
-wxColour *wxRED;
-wxColour *wxBLUE;
-wxColour *wxGREEN;
-wxColour *wxCYAN;
-wxColour *wxLIGHT_GREY;
-
-wxCursor *wxSTANDARD_CURSOR = (wxCursor *) NULL;
-wxCursor *wxHOURGLASS_CURSOR = (wxCursor *) NULL;
-wxCursor *wxCROSS_CURSOR = (wxCursor *) NULL;
-
-/* 'Null' objects */
-#if wxUSE_ACCEL
-    wxAcceleratorTable   wxNullAcceleratorTable;
-#endif // wxUSE_ACCEL
-
-wxBitmap   wxNullBitmap;
-wxIcon     wxNullIcon;
-wxCursor   wxNullCursor;
-wxPen      wxNullPen;
-wxBrush    wxNullBrush;
-wxFont     wxNullFont;
-wxColour   wxNullColour;
-wxPalette  wxNullPalette;
-
-/* 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 *wxDirDialogNameStr = wxT("wxDirCtrl");
-const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
-const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl");
-
-/* Dafaults for wxWindow etc. */
-const wxSize wxDefaultSize(-1, -1);
-const wxPoint wxDefaultPosition(-1, -1);