From 6a76384f2d9d70e209cbbefb8e59906603250641 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 10 Apr 2003 20:33:17 +0000 Subject: [PATCH] extracted duplicated code from src/*/data.cpp in a common file git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/filelist.txt | 1 + src/common/datacmn.cpp | 160 +++++++++++++++++++++++++++++++++ src/gtk/data.cpp | 144 +---------------------------- src/gtk1/data.cpp | 144 +---------------------------- src/mac/carbon/data.cpp | 125 +------------------------- src/mac/data.cpp | 125 +------------------------- src/mgl/data.cpp | 150 +------------------------------ src/motif/data.cpp | 121 ++----------------------- src/os2/data.cpp | 135 +--------------------------- src/x11/data.cpp | 121 ++----------------------- 10 files changed, 189 insertions(+), 1037 deletions(-) create mode 100644 src/common/datacmn.cpp diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index a0f30e9fa2..c09c60b913 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -135,6 +135,7 @@ containr.cpp Common cshelp.cpp Common ctrlcmn.cpp Common ctrlsub.cpp Common +datacmn.cpp Common Base datetime.cpp Common Base datstrm.cpp Common Base db.cpp Common Win32Only,Base diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp new file mode 100644 index 0000000000..4d985031a2 --- /dev/null +++ b/src/common/datacmn.cpp @@ -0,0 +1,160 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: common/datacmn.cpp +// Purpose: contains definitions of various global wxWindows variables +// Author: Vadim Zeitlin +// Modified by: +// Created: 10.04.03 (from src/*/data.cpp files) +// RCS-ID: $Id$ +// Copyright: (c) 1997-2002 wxWindows development team +// License: wxWindows license +/////////////////////////////////////////////////////////////////////////////// + +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/wx.h" + #include "wx/treectrl.h" +#endif // WX_PRECOMP + +// ============================================================================ +// implementation +// ============================================================================ + +// Useful buffer, initialized in wxCommonInit +wxChar *wxBuffer = NULL; + +// Windows List +wxWindowList wxTopLevelWindows; + +// List of windows pending deletion +wxList WXDLLEXPORT wxPendingDelete; + +int wxPageNumber; + +// GDI Object Lists +wxFontList *wxTheFontList = NULL; +wxPenList *wxThePenList = NULL; +wxBrushList *wxTheBrushList = 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 +#if wxUSE_ACCEL +wxAcceleratorTable wxNullAcceleratorTable; +#endif // wxUSE_ACCEL + +wxBitmap wxNullBitmap; +wxIcon wxNullIcon; +wxCursor wxNullCursor; +wxPen wxNullPen; +wxBrush wxNullBrush; +#if wxUSE_PALETTE +wxPalette wxNullPalette; +#endif // wxUSE_PALETTE +wxFont wxNullFont; +wxColour wxNullColour; + +// Default window names +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 = +#if defined(__WXMSW__) || defined(__WXOS2__) + wxT("*.*") +#else // Unix/Mac + wxT("*") +#endif + ; +WXDLLEXPORT_DATA(const wxChar *) wxTreeCtrlNameStr = wxT("treeCtrl"); +WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl"); +WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/"); + +#if defined(__WXMSW__) || defined(__WXOS2__) +WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT"); +#endif + + +const wxSize wxDefaultSize(-1, -1); +const wxPoint wxDefaultPosition(-1, -1); + diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp index 4979216dae..791691b345 100644 --- a/src/gtk/data.cpp +++ b/src/gtk/data.cpp @@ -1,35 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: data.cpp -// Purpose: +// Name: gtk/data.cpp +// Purpose: Various global GTK-specific data // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -// #pragma implementation -#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 */ @@ -48,123 +30,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"); - -/* See wx/utils.h */ -const wxChar *wxFloatToStringStr = wxT("%.2f"); -const wxChar *wxDoubleToStringStr = wxT("%.2f"); - -/* Dafaults for wxWindow etc. */ -const wxSize wxDefaultSize(-1, -1); -const wxPoint wxDefaultPosition(-1, -1); diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp index 4979216dae..791691b345 100644 --- a/src/gtk1/data.cpp +++ b/src/gtk1/data.cpp @@ -1,35 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: data.cpp -// Purpose: +// Name: gtk/data.cpp +// Purpose: Various global GTK-specific data // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -// #pragma implementation -#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 */ @@ -48,123 +30,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"); - -/* See wx/utils.h */ -const wxChar *wxFloatToStringStr = wxT("%.2f"); -const wxChar *wxDoubleToStringStr = wxT("%.2f"); - -/* Dafaults for wxWindow etc. */ -const wxSize wxDefaultSize(-1, -1); -const wxPoint wxDefaultPosition(-1, -1); diff --git a/src/mac/carbon/data.cpp b/src/mac/carbon/data.cpp index d0aceaf40a..1f0bea00d2 100644 --- a/src/mac/carbon/data.cpp +++ b/src/mac/carbon/data.cpp @@ -1,130 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: data.cpp -// Purpose: Various data +// Name: mac/data.cpp +// Purpose: Various global Mac-specific data // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#endif - -#include "wx/wx.h" - -#if wxUSE_POSTSCRIPT -#include "wx/generic/dcpsg.h" -#endif - -#define _MAXPATHLEN 500 - -// Windows List -wxWindowList 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; - -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; - -// 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("statictext"); -const wxChar *wxStaticBitmapNameStr = wxT("staticbitmap"); -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("/"); +#include "wx/event.h" #if wxUSE_SHARED_LIBRARY ///// Event tables (also must be in one, statically-linked file for shared libraries) @@ -138,5 +23,3 @@ const wxEventTable wxEvtHandler::sm_eventTable = const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL } }; #endif -const wxSize wxDefaultSize(-1, -1); -const wxPoint wxDefaultPosition(-1, -1); diff --git a/src/mac/data.cpp b/src/mac/data.cpp index d0aceaf40a..1f0bea00d2 100644 --- a/src/mac/data.cpp +++ b/src/mac/data.cpp @@ -1,130 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: data.cpp -// Purpose: Various data +// Name: mac/data.cpp +// Purpose: Various global Mac-specific data // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#endif - -#include "wx/wx.h" - -#if wxUSE_POSTSCRIPT -#include "wx/generic/dcpsg.h" -#endif - -#define _MAXPATHLEN 500 - -// Windows List -wxWindowList 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; - -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; - -// 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("statictext"); -const wxChar *wxStaticBitmapNameStr = wxT("staticbitmap"); -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("/"); +#include "wx/event.h" #if wxUSE_SHARED_LIBRARY ///// Event tables (also must be in one, statically-linked file for shared libraries) @@ -138,5 +23,3 @@ const wxEventTable wxEvtHandler::sm_eventTable = const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL } }; #endif -const wxSize wxDefaultSize(-1, -1); -const wxPoint wxDefaultPosition(-1, -1); diff --git a/src/mgl/data.cpp b/src/mgl/data.cpp index bd9a78ccd5..7e15d92ce3 100644 --- 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); diff --git a/src/motif/data.cpp b/src/motif/data.cpp index a8d3b651b9..93fae931ee 100644 --- a/src/motif/data.cpp +++ b/src/motif/data.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: data.cpp -// Purpose: Various data +// Name: motif/data.cpp +// Purpose: Various Motif-specific global data // Author: Julian Smart // Modified by: // Created: 17/09/98 @@ -9,118 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#endif +// this file is empty for now but a translation unit is not supposed to be +// completely empty +extern int wxMotifDummyData; -#include "wx/wx.h" -#include "wx/dcps.h" - -#define _MAXPATHLEN 500 - -// Windows List -wxWindowList 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; - -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; - -// 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("wxTreeCtrl"); -const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl"); -const wxChar *wxDirDialogDefaultFolderStr = wxT("/"); - -const wxSize wxDefaultSize(-1, -1); -const wxPoint wxDefaultPosition(-1, -1); diff --git a/src/os2/data.cpp b/src/os2/data.cpp index df2a65f7d5..191aa73da1 100644 --- 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,142 +16,9 @@ #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; - // 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 -// -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 wxChar *wxUserResourceStr = wxT("TEXT"); - -const wxSize wxDefaultSize(-1, -1); -const wxPoint wxDefaultPosition(-1, -1); - diff --git a/src/x11/data.cpp b/src/x11/data.cpp index 35e6f643f0..9a16dd6c4a 100644 --- a/src/x11/data.cpp +++ b/src/x11/data.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: data.cpp -// Purpose: Various data +// Name: x11/data.cpp +// Purpose: Various X11-specific global data // Author: Julian Smart // Modified by: // Created: 17/09/98 @@ -9,118 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#endif +// this file is empty for now but a translation unit is not supposed to be +// completely empty +extern int wxX11DummyData; -#include "wx/wx.h" -#include "wx/dcps.h" - -#define _MAXPATHLEN 500 - -// Windows List -wxWindowList 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; - -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; - -/* 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"); - -const wxSize wxDefaultSize(-1, -1); -const wxPoint wxDefaultPosition(-1, -1); -- 2.45.2