Win16 cursor/icon functions are not needed any longer

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

diff --git a/src/os2/data.cpp b/src/os2/data.cpp
index aea15f67990a048c5d31c55dedd3253cc57f6592..3b0395883ca6b579bdcd6c643906421daec91a73 100644 (file)
--- a/src/os2/data.cpp
+++ b/src/os2/data.cpp
@@ -1,34 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        data.cpp
 // Purpose:     Various data
 /////////////////////////////////////////////////////////////////////////////
 // Name:        data.cpp
 // Purpose:     Various data

-// Author:      AUTHOR
+// 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
 

+#include "wx/prntbase.h"
+

 #define _MAXPATHLEN 500
 
 #define _MAXPATHLEN 500
 

-// Useful buffer, initialized in CommonInit
-char *wxBuffer = NULL;
+// Useful buffer, initialized in wxCommonInit
+wxChar *wxBuffer = NULL;

 
 // Windows List
 
 // Windows List

-wxList wxTopLevelWindows;
+wxWindowList wxTopLevelWindows;

 
 // List of windows pending deletion
 
 // List of windows pending deletion

-wxList wxPendingDelete;
+wxList WXDLLEXPORT wxPendingDelete;
+
+// 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;
 
 
 int wxPageNumber;
 


@@ -90,58 +96,66 @@ wxBrush  wxNullBrush;
 wxPalette wxNullPalette;
 wxFont   wxNullFont;
 wxColour wxNullColour;
 wxPalette wxNullPalette;
 wxFont   wxNullFont;
 wxColour wxNullColour;

+wxNativeFontInfo wxNullNativeFontInfo;

 
 

+//

 // Default window names
 // 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";
+//
+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
+//
+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");

 
 // See wx/utils.h
 
 // See wx/utils.h

-const char *wxFloatToStringStr = "%.2f";
-const char *wxDoubleToStringStr = "%.2f";
+const wxChar *wxFloatToStringStr = wxT("%.2f");
+const wxChar *wxDoubleToStringStr = wxT("%.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
+const wxChar *wxUserResourceStr = wxT("TEXT");

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

+