adapted to mac

[wxWidgets.git] / src / mac / carbon / data.cpp

diff --git a/src/mac/carbon/data.cpp b/src/mac/carbon/data.cpp
index 5e6c4185198e735e0e404e30df4754f7f8aba214..5715b65c8ff8b34718a94dcd4806f0b5c1605326 100644 (file)
--- a/src/mac/carbon/data.cpp
+++ b/src/mac/carbon/data.cpp
@@ -16,7 +16,7 @@
 #include "wx/wx.h"
 
 #if wxUSE_POSTSCRIPT
 #include "wx/wx.h"
 
 #if wxUSE_POSTSCRIPT

-#include "wx/postscrp.h"
+#include "wx/generic/dcpsg.h"

 #endif
 
 #define _MAXPATHLEN 500
 #endif
 
 #define _MAXPATHLEN 500


@@ -25,7 +25,7 @@
 char *wxBuffer = NULL;
 
 // Windows List
 char *wxBuffer = NULL;
 
 // Windows List

-wxList wxTopLevelWindows;
+wxWindowList wxTopLevelWindows;

 
 // List of windows pending deletion
 wxList wxPendingDelete;
 
 // List of windows pending deletion
 wxList wxPendingDelete;


@@ -119,7 +119,7 @@ const char *wxButtonBarNameStr = "buttonbar";
 const char *wxEnhDialogNameStr = "Shell";
 const char *wxToolBarNameStr = "toolbar";
 const char *wxStatusLineNameStr = "status_line";
 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 *wxGetTextFromUserPromptStr = "Input Text";
 const char *wxMessageBoxCaptionStr = "Message";
 const char *wxFileSelectorPromptStr = "Select a file";


@@ -131,10 +131,6 @@ const char *wxFatalErrorStr = "wxWindows Fatal Error";
 const char *wxFloatToStringStr = "%.2f";
 const char *wxDoubleToStringStr = "%.2f";
 
 const char *wxFloatToStringStr = "%.2f";
 const char *wxDoubleToStringStr = "%.2f";
 

-#if wxUSE_POSTSCRIPT
-wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL;
-#endif
-

 #if wxUSE_SHARED_LIBRARY
 ///// Event tables (also must be in one, statically-linked file for shared libraries)
 
 #if wxUSE_SHARED_LIBRARY
 ///// Event tables (also must be in one, statically-linked file for shared libraries)