X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6460682a21a5f58ff7914676fd80b0730803398..26128999a7e2bc05024e09ba2658d4a6ab87accd:/src/msw/data.cpp?ds=sidebyside diff --git a/src/msw/data.cpp b/src/msw/data.cpp index 53d6991dc3..e7e0283111 100644 --- a/src/msw/data.cpp +++ b/src/msw/data.cpp @@ -24,6 +24,8 @@ #include "wx/wx.h" #endif +#include "wx/prntbase.h" + #define _MAXPATHLEN 500 // Useful buffer, initialized in wxCommonInit @@ -33,7 +35,7 @@ char *wxBuffer = NULL; wxList wxTopLevelWindows; // 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 @@ -144,6 +146,7 @@ const char *wxFileSelectorPromptStr = "Select a file"; const char *wxFileSelectorDefaultWildcardStr = "*.*"; const char *wxInternalErrorStr = "wxWindows Internal Error"; const char *wxFatalErrorStr = "wxWindows Fatal Error"; +const char *wxTreeCtrlNameStr = "treeCtrl"; // See wx/utils.h const char *wxFloatToStringStr = "%.2f"; @@ -153,11 +156,6 @@ const char *wxDoubleToStringStr = "%.2f"; const char *wxUserResourceStr = "TEXT"; #endif -#if wxUSE_POSTSCRIPT -class wxPrintPaperDatabase; -wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL; -#endif - #if wxUSE_SHARED_LIBRARY /* * For wxWindows to be made into a dynamic library (e.g. Sun), @@ -314,13 +312,14 @@ IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog) #endif #if wxUSE_POSTSCRIPT -#include "wx/postscrp.h" +#include "wx/dcps.h" IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxPageSetupData, wxObject) +#endif + IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList) -#endif #if wxUSE_WX_RESOURCES #include "wx/resource.h" @@ -332,6 +331,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable) IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) +IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent) @@ -410,6 +410,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase) #endif +#if wxUSE_SOCKETS + #include "wx/sckaddr.h" IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress) @@ -454,6 +456,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase) IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase) IMPLEMENT_DYNAMIC_CLASS(wxTCPConnection, wxConnectionBase) +#endif + #include "wx/statusbr.h" IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)