Added George Tasker's forward slash fix to file dialog; added some consts to prntbase.h;

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

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index f0aba88f2b3e6354573acd13110f177f473c1f42..3e02e57e59e68995bf6296d2a961b719cd9dbbe7 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma implementation "data.h"

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


@@ -33,7 +33,7 @@ char *wxBuffer = NULL;
 wxList wxTopLevelWindows;
 
 // List of windows pending deletion
 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
 
 // Current cursor, in order to hang on to
 // cursor handle when setting the cursor globally


@@ -144,6 +144,7 @@ const char *wxFileSelectorPromptStr = "Select a file";
 const char *wxFileSelectorDefaultWildcardStr = "*.*";
 const char *wxInternalErrorStr = "wxWindows Internal Error";
 const char *wxFatalErrorStr = "wxWindows Fatal Error";
 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";
 
 // See wx/utils.h
 const char *wxFloatToStringStr = "%.2f";


@@ -154,6 +155,7 @@ const char *wxUserResourceStr = "TEXT";
 #endif
 
 #if wxUSE_POSTSCRIPT
 #endif
 
 #if wxUSE_POSTSCRIPT

+class wxPrintPaperDatabase;

 wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL;
 #endif
 
 wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL;
 #endif
 


@@ -197,11 +199,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 #include "wx/dcclient.h"
 #include "wx/dcscreen.h"
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #include "wx/dcclient.h"
 #include "wx/dcscreen.h"
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)

-IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxDC)

 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)

-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
+IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
+IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)

 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)

+IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)

 
 #if defined(__WXMSW__)
 #include "wx/dcprint.h"
 
 #if defined(__WXMSW__)
 #include "wx/dcprint.h"


@@ -313,7 +315,7 @@ IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
 #endif
 
 #if wxUSE_POSTSCRIPT
 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPageSetupData, wxObject)


@@ -331,6 +333,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
 IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
 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)
 IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)