move some data definitions to more appropriate places

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 84cd83b9b40203c05e52861784819e8f089bb1d9..a6423af998f99763c3208d3fe84ea1f280ac757d 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -93,8 +93,6 @@ protected:
 // global variables
 // ---------------------------------------------------------------------------
 
 // global variables
 // ---------------------------------------------------------------------------
 

-extern WXDLLEXPORT_DATA(int) wxPageNumber;
-

 // ---------------------------------------------------------------------------
 // wxDC is the device context - object on which any drawing is done
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxDC is the device context - object on which any drawing is done
 // ---------------------------------------------------------------------------

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index b1e5d72c182367316f3e1ba7bb949b3943954d2d..3b7a206cb0ff935cc335404333db83b5e32d3e34 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -676,9 +676,6 @@ extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
 extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
 extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;
 
 extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
 extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;
 

-// The list of objects which should be deleted
-extern WXDLLEXPORT_DATA(wxList) wxPendingDelete;
-

 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index ddd9888e68ef114f64a35710a5e18c2544958a2f..7d9ea915f347a1da5ff1718242d2312a78ba0fd1 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -11,16 +11,19 @@
 #ifndef _WX_DCPSG_H_
 #define _WX_DCPSG_H_
 
 #ifndef _WX_DCPSG_H_
 #define _WX_DCPSG_H_
 

-#include "wx/dc.h"
+#include "wx/defs.h"

 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #if wxUSE_POSTSCRIPT
 
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #if wxUSE_POSTSCRIPT
 

+#include "wx/dc.h"

 #include "wx/dialog.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"
 
 #include "wx/dialog.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"
 

+extern WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------

diff --git a/include/wx/mac/carbon/dc.h b/include/wx/mac/carbon/dc.h
index 2513c7c98940c23ea491bfc1bfb9d6c9f681f0cd..6080697290e538322c1881227c3feeacf66a5bdb 100644 (file)
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -34,9 +34,6 @@
 #endif
 
 
 #endif
 
 

-extern int wxPageNumber;
-
-

 class wxMacPortStateHelper;
 
 class WXDLLEXPORT wxGraphicPath
 class wxMacPortStateHelper;
 
 class WXDLLEXPORT wxGraphicPath

diff --git a/include/wx/mac/classic/dc.h b/include/wx/mac/classic/dc.h
index a5bc3226a99b31937ce4dbaaf1d9a8d36d72ca37..a14d40e6a894764dbc3b57f6fd4633fc141bb7e9 100644 (file)
--- a/include/wx/mac/classic/dc.h
+++ b/include/wx/mac/classic/dc.h
@@ -37,8 +37,6 @@
 // global variables
 //-----------------------------------------------------------------------------
 
 // global variables
 //-----------------------------------------------------------------------------
 

-extern int wxPageNumber;
-

 class wxMacPortStateHelper ;
 //-----------------------------------------------------------------------------
 // wxDC
 class wxMacPortStateHelper ;
 //-----------------------------------------------------------------------------
 // wxDC

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 6c7b1b1a4a83dbcae27911d182477a3a8f9af9a7..6a3e7123a2524fbfe03908b16883325703ccaa8e 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -111,7 +111,6 @@ WXDLLEXPORT_DATA(extern const wxChar) wxBitmapRadioButtonNameStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxScrollBarNameStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxScrollBarNameStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[];

-WXDLLEXPORT_DATA(extern const wxChar) wxEnhDialogNameStr[];

 WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxGetTextFromUserPromptStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
 WXDLLEXPORT_DATA(extern const wxChar) wxGetTextFromUserPromptStr[];

diff --git a/include/wx/window.h b/include/wx/window.h
index 9f38ecb22db9c683a8c784c67189574d20db23e5..abdd96aa052d28129e04f7089fa3422b820471e6 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -113,6 +113,7 @@ WX_DECLARE_LIST_3(wxWindow, wxWindowBase, wxWindowList, wxWindowListNode, class
 // ----------------------------------------------------------------------------
 
 extern WXDLLEXPORT_DATA(wxWindowList) wxTopLevelWindows;
 // ----------------------------------------------------------------------------
 
 extern WXDLLEXPORT_DATA(wxWindowList) wxTopLevelWindows;

+extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;

 
 // ----------------------------------------------------------------------------
 // wxWindowBase is the base class for all GUI controls/widgets, this is the public
 
 // ----------------------------------------------------------------------------
 // wxWindowBase is the base class for all GUI controls/widgets, this is the public

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 3316cced794a86c0cf87aa3ab7e75642ec55f634..d37a9be4acf8876816e714ce6535e72fbd338427 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -55,6 +55,7 @@
 #include "wx/build.h"
 WX_CHECK_BUILD_OPTIONS("wxCore")
 
 #include "wx/build.h"
 WX_CHECK_BUILD_OPTIONS("wxCore")
 

+WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;

 
 // ----------------------------------------------------------------------------
 // wxEventLoopPtr
 
 // ----------------------------------------------------------------------------
 // wxEventLoopPtr

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index 6a1d9e7cd4f9f44ff18349d7b41bd8e3e0a3e210..cf053fb611cdc72a087f2e5dcf5f40d5da5caf67 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -30,6 +30,8 @@
     #include "wx/choice.h"
 #endif
 
     #include "wx/choice.h"
 #endif
 

+WXDLLIMPEXP_DATA_CORE(const wxChar) wxChoiceNameStr[] = wxT("choice");
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index beae40cb11fea06f73c69f6d582b10f139416e20..a0af638bcb9ef6b34c3f023882f36a6c6d9f286d 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -38,6 +38,8 @@
     #include "wx/statbmp.h"
 #endif // wxUSE_STATBMP
 
     #include "wx/statbmp.h"
 #endif // wxUSE_STATBMP
 

+WXDLLIMPEXP_DATA_CORE(const wxChar) wxControlNameStr[] = wxT("control");
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================

diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index 1f157aae6895d76eef70a33854feff20b50bb933..bb7935b58bcc0a10aba5f831871900682b516558 100644 (file)
--- a/src/common/datacmn.cpp
+++ b/src/common/datacmn.cpp
@@ -25,56 +25,25 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
-    #include "wx/treectrl.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

+#include "wx/accel.h"
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // 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;
-wxColourDatabase *wxTheColourDatabase = NULL;
-

 // 'Null' objects
 #if wxUSE_ACCEL
 wxAcceleratorTable wxNullAcceleratorTable;
 #endif // wxUSE_ACCEL
 
 // '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
 // Default window names

-extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[] = wxT("control");

 extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[] = wxT("button");
 extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[] = wxT("check");
 extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[] = wxT("button");
 extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[] = wxT("check");

-extern WXDLLEXPORT_DATA(const wxChar) wxChoiceNameStr[] = wxT("choice");

 extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[] = wxT("comboBox");
 extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[] = wxT("dialog");
 extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[] = wxT("frame");
 extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[] = wxT("comboBox");
 extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[] = wxT("dialog");
 extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[] = wxT("frame");

-extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[] = wxT("gauge");

 extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[] = wxT("groupBox");
 extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[] = wxT("listBox");
 extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[] = wxT("listCtrl");
 extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[] = wxT("groupBox");
 extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[] = wxT("listBox");
 extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[] = wxT("listCtrl");


@@ -90,13 +59,9 @@ extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[] = wxT("slider");
 extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[] = wxT("status_line");
 extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlNameStr[] = wxT("text");
 extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[] = wxT("treeCtrl");
 extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[] = wxT("status_line");
 extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlNameStr[] = wxT("text");
 extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[] = wxT("treeCtrl");

-extern WXDLLEXPORT_DATA(const wxChar) wxEnhDialogNameStr[] = wxT("Shell");

 extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[] = wxT("toolbar");
 extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[] = wxT("toolbar");

-extern WXDLLEXPORT_DATA(const wxChar) wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");

 
 // Default messages
 
 // Default messages

-extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[] = wxT("Input Text");
-extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");

 extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[] = wxT("Message");
 extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[] = wxT("Select a file");
 
 extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[] = wxT("Message");
 extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[] = wxT("Select a file");
 


@@ -114,8 +79,3 @@ extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[] = wxT("/");
 #if defined(__WXMSW__) || defined(__OS2__)
 WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
 #endif
 #if defined(__WXMSW__) || defined(__OS2__)
 WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
 #endif

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 4b924ef900def5315dc4d9a8be0f071f16bf64d9..87d0a54f73e6d57a7fe92f7c79fe307d7064d95f 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -17,13 +17,13 @@
 
 #if wxUSE_DATAVIEWCTRL
 
 
 #if wxUSE_DATAVIEWCTRL
 

+#include "wx/dataview.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/object.h"

     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

-#include "wx/image.h"
-#include "wx/dataview.h"
+WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");

 
 // ---------------------------------------------------------
 // wxDataViewModel
 
 // ---------------------------------------------------------
 // wxDataViewModel

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index baeb1c5ee8b8bd9e76ad1e1d1956aa4dc9a58217..f637c952d3dac0e103e561174fe80fdf2c7b1a9e 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -29,6 +29,8 @@
 
 // bool wxDCBase::sm_cacheing = false;
 
 
 // bool wxDCBase::sm_cacheing = false;
 

+IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================

diff --git a/src/common/gaugecmn.cpp b/src/common/gaugecmn.cpp
index 9a5b31881c007d2fc04222dfb39cc015602716a1..453337e805a16e394ac344dda8dd54d059ede0d2 100644 (file)
--- a/src/common/gaugecmn.cpp
+++ b/src/common/gaugecmn.cpp
@@ -27,9 +27,11 @@
 #ifndef WX_PRECOMP
 #endif //WX_PRECOMP
 
 #ifndef WX_PRECOMP
 #endif //WX_PRECOMP
 

+#if wxUSE_GAUGE
+

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

-#if wxUSE_GAUGE
+WXDLLIMPEXP_DATA_CORE(const wxChar) wxGaugeNameStr[] = wxT("gauge");

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 161eb134d1f1a41fddf89049799bb60179c20b06..6d3faf11f71f5fc4cc4b715e0f23bc966a2b99ae 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -24,10 +20,6 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

-    #include "wx/event.h"
-    #include "wx/app.h"
-    #include "wx/utils.h"
-    #include "wx/dc.h"

     #include "wx/pen.h"
     #include "wx/brush.h"
     #include "wx/palette.h"
     #include "wx/pen.h"
     #include "wx/brush.h"
     #include "wx/palette.h"


@@ -36,25 +28,32 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

+#include "wx/colour.h"

 #include "wx/bitmap.h"
 #include "wx/font.h"
 #include "wx/hashmap.h"
 
 #include "wx/bitmap.h"
 #include "wx/font.h"
 #include "wx/hashmap.h"
 

-#include <string.h>
-
-#ifdef __WXMOTIF__
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <Xm/Xm.h>
-#ifdef __VMS__
-#pragma message enable nosimpint
-#endif
+WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
+WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;
+WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;
+
+WXDLLIMPEXP_DATA_CORE(wxColourDatabase*) wxTheColourDatabase;
+
+WXDLLIMPEXP_DATA_CORE(wxBitmap)  wxNullBitmap;
+WXDLLIMPEXP_DATA_CORE(wxBrush)   wxNullBrush;
+WXDLLIMPEXP_DATA_CORE(wxColour)  wxNullColour;
+WXDLLIMPEXP_DATA_CORE(wxCursor)  wxNullCursor;
+WXDLLIMPEXP_DATA_CORE(wxFont)    wxNullFont;
+WXDLLIMPEXP_DATA_CORE(wxIcon)    wxNullIcon;
+WXDLLIMPEXP_DATA_CORE(wxPen)     wxNullPen;
+#if wxUSE_PALETTE
+WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette;

 #endif
 
 #endif
 

-#ifdef __WXX11__
-#include "X11/Xlib.h"
-#endif
+WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);
+
+const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
+const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);

 
 #if wxUSE_EXTENDED_RTTI
 
 
 #if wxUSE_EXTENDED_RTTI
 


@@ -86,8 +85,6 @@ wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<w
 
 #endif
 
 
 #endif
 

-IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
-

 wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
 {
     x = point1.x;
 wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
 {
     x = point1.x;

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 45f341c2e208602238ca1203c4aacd8db2d50087..9e8bc62c7c5837b766951c846ec59c9a8d9d85d2 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -80,16 +80,15 @@
 // For reporting compile- and runtime version of GTK+ in the ctrl+alt+mclick dialog.
 // The gtk includes don't pull any other headers in, at least not on my system - MR
 #ifdef __WXGTK__
 // For reporting compile- and runtime version of GTK+ in the ctrl+alt+mclick dialog.
 // The gtk includes don't pull any other headers in, at least not on my system - MR
 #ifdef __WXGTK__

-    #ifdef __WXGTK20__
-        #include <gtk/gtkversion.h>
-    #else
-        #include <gtk/gtkfeatures.h>
-    #endif
+    #include <gtk/gtkversion.h>

     extern const unsigned int gtk_major_version;
     extern const unsigned int gtk_minor_version;
     extern const unsigned int gtk_micro_version;
 #endif
 
     extern const unsigned int gtk_major_version;
     extern const unsigned int gtk_minor_version;
     extern const unsigned int gtk_micro_version;
 #endif
 

+// Windows List
+WXDLLIMPEXP_DATA_CORE(wxWindowList) wxTopLevelWindows;
+

 // ----------------------------------------------------------------------------
 // static data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static data
 // ----------------------------------------------------------------------------

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 62c685559c7cedd854866f812976337ed3447740..f57daec342654b5a8ee0c945ff4b34e3a60fbb0c 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -35,6 +35,8 @@
 #include "wx/math.h"
 #include "wx/stdpaths.h"
 
 #include "wx/math.h"
 #include "wx/stdpaths.h"
 

+WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
+

 #ifdef __WXMSW__
 
 #ifdef DrawText
 #ifdef __WXMSW__
 
 #ifdef DrawText

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 2a9f132a23f155ca7cb6e44a3453010a606d4bf9..6c659fd660ec62e6ee5e49f2ec87fc60b853a1f4 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -26,6 +26,8 @@
 
 #if wxUSE_TEXTDLG
 
 
 #if wxUSE_TEXTDLG
 

+#include "wx/generic/textdlgg.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"


@@ -40,7 +42,8 @@
     #include "wx/statline.h"
 #endif
 
     #include "wx/statline.h"
 #endif
 

-#include "wx/generic/textdlgg.h"
+WXDLLIMPEXP_DATA_CORE(const wxChar) wxGetTextFromUserPromptStr[] = wxT("Input Text");
+WXDLLIMPEXP_DATA_CORE(const wxChar) wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index c4396ae97a10845424470974c0afcf8709b4032b..2918e4747e6a06914291da89fbbde32b16cb0fef 100644 (file)
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -11,9 +11,6 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/object.h"
-    #include "wx/window.h"
-    #include "wx/dc.h"

     #include "wx/cursor.h"
 #endif
 
     #include "wx/cursor.h"
 #endif
 

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index f88a1fdba0f24bc54b898da4970bebcdbb11b32e..33378f778501e3788703216a6f6ccaa3d3071002 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -38,8 +38,6 @@ const int wxMENU_HEIGHT = 27;
 // globals
 //-----------------------------------------------------------------------------
 
 // globals
 //-----------------------------------------------------------------------------
 

-extern wxList wxPendingDelete;
-

 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 1a0350bcd73f454e684906d8fd03dd46bd346e29..b425e1c1199743622dc3471cf32d1b4280551a8b 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -54,8 +54,6 @@
 // data
 // ----------------------------------------------------------------------------
 
 // data
 // ----------------------------------------------------------------------------
 

-extern wxList           wxPendingDelete;
-

 extern int              g_openDialogs;
 extern wxWindowGTK     *g_delayedFocus;
 
 extern int              g_openDialogs;
 extern wxWindowGTK     *g_delayedFocus;
 

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 4079dc814599f862e27e76de2ed43d0354143abf..93308298171024b5f8d6cc9d286a8ff20d799566 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -221,7 +221,6 @@ extern GtkContainerClass *pizza_parent_class;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern wxList     wxPendingDelete;

 extern bool       g_blockEventsOnDrag;
 extern bool       g_blockEventsOnScroll;
 extern wxCursor   g_globalCursor;
 extern bool       g_blockEventsOnDrag;
 extern bool       g_blockEventsOnScroll;
 extern wxCursor   g_globalCursor;

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index 0b03d0d3043015107926613b716afc9287d48c71..47b3493b95b725a287e030d763d5bb0450812a4c 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -45,8 +45,6 @@ extern bool g_isIdle;
 // globals
 //-----------------------------------------------------------------------------
 
 // globals
 //-----------------------------------------------------------------------------
 

-extern wxList wxPendingDelete;
-

 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 81d12e46dc32705a36593999c8e20e1a0f272e00..fa58734334d6fe1d47b37bbdd4fd940848b791d5 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -61,8 +61,6 @@ extern bool g_isIdle;
 // data
 // ----------------------------------------------------------------------------
 
 // data
 // ----------------------------------------------------------------------------
 

-extern wxList           wxPendingDelete;
-

 extern int              g_openDialogs;
 extern wxWindowGTK     *g_delayedFocus;
 
 extern int              g_openDialogs;
 extern wxWindowGTK     *g_delayedFocus;
 

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index f92f405c9f155fcbc111679c348491ed74760e6c..fdc9421a8dd6da939b621ff6bf93e30faedc11a9 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -203,7 +203,6 @@
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern wxList     wxPendingDelete;

 extern bool       g_blockEventsOnDrag;
 extern bool       g_blockEventsOnScroll;
 extern wxCursor   g_globalCursor;
 extern bool       g_blockEventsOnDrag;
 extern bool       g_blockEventsOnScroll;
 extern wxCursor   g_globalCursor;

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index a7aeda322175e771f98b2081a29f60dff9c97626..68eb7808f628076e2825c0bcb50753f6e0ac6572 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -67,8 +67,6 @@
 #  include <Devices.h>
 #endif
 
 #  include <Devices.h>
 #endif
 

-extern wxList wxPendingDelete;
-

 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;
 #endif
 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;
 #endif

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index ee4ded5dba1ed6a1f7cde1d3d571a27e554b43cf..0a478ad303b851a5814ece450ca381d7a0204efe 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -27,8 +27,6 @@
 // for modal dialogs
 wxList wxModalDialogs;
 
 // for modal dialogs
 wxList wxModalDialogs;
 

-extern wxList wxPendingDelete;
-

 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index d9868a8728dcce5cda037a7b0e7ed2cbe6360161..00e588c9459cf3a0a26cac2f593026c4287f771f 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -28,7 +28,6 @@
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;

-//extern wxList wxPendingDelete;

 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 409bdd8d9606104da8f57a9bc5270ee9cd6322e9..dbf267960f8ad2fbc6b47911c69196e01f2e6e9f 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -68,8 +68,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-extern wxList wxPendingDelete;
-

 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
 #else
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
 #else

diff --git a/src/mac/classic/dialog.cpp b/src/mac/classic/dialog.cpp
index f4f2a537fc7518da3c3a6ec08dd1faf0195998f1..198acc1f4cdc8242071989951fd42161438a23c9 100644 (file)
--- a/src/mac/classic/dialog.cpp
+++ b/src/mac/classic/dialog.cpp
@@ -25,8 +25,6 @@
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 wxList wxModalDialogs;
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 wxList wxModalDialogs;

-//wxList wxModelessWindows;  // Frames and modeless dialogs
-extern wxList wxPendingDelete;

 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 

diff --git a/src/mac/classic/frame.cpp b/src/mac/classic/frame.cpp
index 42e12a8a11f37360a3d7df1753e17d547329e300..d97a3909e51192d2eb9483ad5bbe046079c20e15 100644 (file)
--- a/src/mac/classic/frame.cpp
+++ b/src/mac/classic/frame.cpp
@@ -28,7 +28,6 @@
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;

-extern wxList wxPendingDelete;

 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 96cd1cbbb50177709442db0c061e1936f064aa95..32504a03ab6764cc6734c4d14bedc18a4d587f08 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -60,7 +60,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-extern wxList wxPendingDelete;

 wxWindowMac* gFocusWindow = NULL ;
 
 #ifdef __WXUNIVERSAL__
 wxWindowMac* gFocusWindow = NULL ;
 
 #ifdef __WXUNIVERSAL__

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 278ceb911d0c511458355828a02ec7d2a0f7bc1d..0f86cbcbafb16514471f233f95765919336b4d64 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -67,7 +67,6 @@ static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData,
                                       XtPointer ptr);
 static WXWidget wxCreateTopLevelWidget( WXDisplay* display );
 
                                       XtPointer ptr);
 static WXWidget wxCreateTopLevelWidget( WXDisplay* display );
 

-extern wxList wxPendingDelete;

 extern bool wxAddIdleCallback();
 
 wxHashTable *wxWidgetHashTable = NULL;
 extern bool wxAddIdleCallback();
 
 wxHashTable *wxWidgetHashTable = NULL;

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index f7950934e3311e7ba9bf939573155fdde4899bfa..2536d0e5e05e07cd4695bc8e1991a369cedb8a6d 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -66,7 +66,6 @@
 // for modal dialogs
 wxList wxModalDialogs;
 extern wxList wxModelessWindows;  // Frames and modeless dialogs
 // for modal dialogs
 wxList wxModalDialogs;
 extern wxList wxModelessWindows;  // Frames and modeless dialogs

-extern wxList wxPendingDelete;

 
 #define wxUSE_INVISIBLE_RESIZE 1
 
 
 #define wxUSE_INVISIBLE_RESIZE 1
 

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index bb28dc522380cd32f9b0527ca6eee2d28bdc31dc..6029bd7a324b6e412df7442c42af2ab8080fc400 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -88,7 +88,6 @@ static void wxFrameMapProc(Widget frameShell, XtPointer clientData,
 // ----------------------------------------------------------------------------
 
 extern wxList wxModelessWindows;
 // ----------------------------------------------------------------------------
 
 extern wxList wxModelessWindows;

-extern wxList wxPendingDelete;

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 854e0edced3605f0bdacb42086371d30ae658fee..6a18714bf70bfa72419fce8e4ccb8718fba0e2c9 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -109,8 +109,6 @@
 // global variables
 // ---------------------------------------------------------------------------
 
 // global variables
 // ---------------------------------------------------------------------------
 

-extern wxList WXDLLEXPORT wxPendingDelete;
-

 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
 extern void wxSetKeyboardHook(bool doIt);
 #endif
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
 extern void wxSetKeyboardHook(bool doIt);
 #endif

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index fe9f2d83d0be40e03912979e2b0baed7a7047844..491f4800c283a66ad760011d2d3f4d77eae1946f 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -81,8 +81,7 @@ extern "C" int _System bsdselect(int,
 // global variables
 // ---------------------------------------------------------------------------
 
 // global variables
 // ---------------------------------------------------------------------------
 

-extern wxChar*                      wxBuffer;
-extern wxList WXDLLEXPORT           wxPendingDelete;
+WXDLLEXPORT_DATA(wxChar*) wxBuffer;

 extern wxCursor*                    g_globalCursor;
 
 HAB                                 vHabmain = NULLHANDLE;
 extern wxCursor*                    g_globalCursor;
 
 HAB                                 vHabmain = NULLHANDLE;

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index d04ed2f8f8762bb2a09d85a42d19c6c118ec7c39..c909d19d1638ce2503b65cdf3a0f3855ebddabbe 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -48,8 +48,6 @@
 // globals
 // ----------------------------------------------------------------------------
 
 // globals
 // ----------------------------------------------------------------------------
 

-extern wxList WXDLLEXPORT wxPendingDelete;
-

 #if wxUSE_MENUS_NATIVE
 extern wxMenu *wxCurrentPopupMenu;
 #endif
 #if wxUSE_MENUS_NATIVE
 extern wxMenu *wxCurrentPopupMenu;
 #endif

diff --git a/src/palmos/app.cpp b/src/palmos/app.cpp
index 3361595e65c97d1a63c400661818763afe07b305..b96a01e1170b8a27eb557b497a91c1c26db94992 100644 (file)
--- a/src/palmos/app.cpp
+++ b/src/palmos/app.cpp
@@ -63,8 +63,6 @@
 // global variables
 // ---------------------------------------------------------------------------
 
 // global variables
 // ---------------------------------------------------------------------------
 

-extern wxList WXDLLEXPORT wxPendingDelete;
-

 // NB: all "NoRedraw" classes must have the same names as the "normal" classes
 //     with NR suffix - wxWindow::MSWCreate() supposes this
 const wxChar *wxCanvasClassName        = wxT("wxWindowClass");
 // NB: all "NoRedraw" classes must have the same names as the "normal" classes
 //     with NR suffix - wxWindow::MSWCreate() supposes this
 const wxChar *wxCanvasClassName        = wxT("wxWindowClass");

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index a63e55214fee12445624b850885a1326edefb354..afe3bb92a701374a5beeec2dd425a9888fc59c37 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -46,8 +46,6 @@
 //   global data
 //------------------------------------------------------------------------
 
 //   global data
 //------------------------------------------------------------------------
 

-extern wxList wxPendingDelete;
-

 wxWindowHash *wxWidgetHashTable = NULL;
 wxWindowHash *wxClientWidgetHashTable = NULL;
 
 wxWindowHash *wxWidgetHashTable = NULL;
 wxWindowHash *wxClientWidgetHashTable = NULL;