Fix to wxChar* access.

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

diff --git a/src/os2/data.cpp b/src/os2/data.cpp
index aea15f67990a048c5d31c55dedd3253cc57f6592..28ba3f088491fd313225562b0c405877b61fb034 100644 (file)
--- a/src/os2/data.cpp
+++ b/src/os2/data.cpp
@@ -1,147 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        data.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        data.cpp

-// Purpose:     Various data
-// Author:      AUTHOR
+// Purpose:     Various OS/2-specific global data
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     09/20/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

+#ifndef WX_PRECOMP

 #include "wx/wx.h"
 #include "wx/wx.h"

-
-#if wxUSE_POSTSCRIPT
-#include "wx/dcps.h"

 #endif
 
 #endif
 

-#define _MAXPATHLEN 500
-
-// Useful buffer, initialized in CommonInit
-char *wxBuffer = NULL;
-
-// Windows List
-wxList wxTopLevelWindows;
-
-// List of windows pending deletion
-wxList wxPendingDelete;
-
-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;
+#include "wx/fontutil.h"

 
 

-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;
+// Current cursor, in order to hang on to
+// cursor handle when setting the cursor globally
+wxCursor *g_globalCursor = NULL;

 
 

-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;
+wxNativeFontInfo wxNullNativeFontInfo;

 
 

-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;
-
-// Default window names
-const char *wxButtonNameStr = "button";
-const char *wxCanvasNameStr = "canvas";
-const char *wxCheckBoxNameStr = "check";
-const char *wxChoiceNameStr = "choice";
-const char *wxComboBoxNameStr = "comboBox";
-const char *wxDialogNameStr = "dialog";
-const char *wxFrameNameStr = "frame";
-const char *wxGaugeNameStr = "gauge";
-const char *wxStaticBoxNameStr = "groupBox";
-const char *wxListBoxNameStr = "listBox";
-const char *wxStaticTextNameStr = "message";
-const char *wxStaticBitmapNameStr = "message";
-const char *wxMultiTextNameStr = "multitext";
-const char *wxPanelNameStr = "panel";
-const char *wxRadioBoxNameStr = "radioBox";
-const char *wxRadioButtonNameStr = "radioButton";
-const char *wxBitmapRadioButtonNameStr = "radioButton";
-const char *wxScrollBarNameStr = "scrollBar";
-const char *wxSliderNameStr = "slider";
-const char *wxStaticNameStr = "static";
-const char *wxTextCtrlWindowNameStr = "textWindow";
-const char *wxTextCtrlNameStr = "text";
-const char *wxVirtListBoxNameStr = "virtListBox";
-const char *wxButtonBarNameStr = "buttonbar";
-const char *wxEnhDialogNameStr = "Shell";
-const char *wxToolBarNameStr = "toolbar";
-const char *wxStatusLineNameStr = "status_line";
-const char *wxEmptyString = "";
-const char *wxGetTextFromUserPromptStr = "Input Text";
-const char *wxMessageBoxCaptionStr = "Message";
-const char *wxFileSelectorPromptStr = "Select a file";
-const char *wxFileSelectorDefaultWildcardStr = "*.*";
-const char *wxInternalErrorStr = "wxWindows Internal Error";
-const char *wxFatalErrorStr = "wxWindows Fatal Error";
-
-// See wx/utils.h
-const char *wxFloatToStringStr = "%.2f";
-const char *wxDoubleToStringStr = "%.2f";
-
-#if wxUSE_SHARED_LIBRARY
-///// Event tables (also must be in one, statically-linked file for shared libraries)
-
-// This is the base, wxEvtHandler 'bootstrap' code which is expanded manually here
-const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }
-
-const wxEventTable wxEvtHandler::sm_eventTable =
-       { NULL, &wxEvtHandler::sm_eventTableEntries[0] };
-
-const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL } };
-#endif
+//
+// Class names
+//
+const wxChar*                       wxFrameClassName                 = wxT("wxFrameClass");
+const wxChar*                       wxFrameClassNameNoRedraw         = wxT("wxFrameClassNR");
+const wxChar*                       wxMDIFrameClassName              = wxT("wxMDIFrameClass");
+const wxChar*                       wxMDIFrameClassNameNoRedraw      = wxT("wxMDIFrameClassNR");
+const wxChar*                       wxMDIChildFrameClassName         = wxT("wxMDIChildFrameClass");
+const wxChar*                       wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
+const wxChar*                       wxPanelClassName                 = wxT("wxPanelClass");
+const wxChar*                       wxPanelClassNameNR               = wxT("wxPanelClassNR");
+const wxChar*                       wxCanvasClassName                = wxT("wxCanvasClass");
+const wxChar*                       wxCanvasClassNameNR              = wxT("wxCanvasClassNR");

 
 

-const wxSize wxDefaultSize(-1, -1);
-const wxPoint wxDefaultPosition(-1, -1);