wxMotif Solaris 2.6 compilation fixes

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

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index 0dd6d35d8999d3ae138ac299e062f96db6d65a77..39b6114278adbf9bb23055133e919704121f5265 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -59,7 +59,9 @@ char *wxOsVersion = (char *) NULL;
 
 /* For printing several pages */
 int wxPageNumber;
-wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase *) NULL;
+
+// Now in prntbase.cpp
+// wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase *) NULL;
 
 /* GDI Object Lists */
 wxBrushList      *wxTheBrushList = (wxBrushList *) NULL;
@@ -69,7 +71,9 @@ wxColourDatabase *wxTheColourDatabase = (wxColourDatabase *) NULL;
 wxBitmapList     *wxTheBitmapList = (wxBitmapList *) NULL;
   
 /* X only font names */
+/*
 wxFontNameDirectory *wxTheFontNameDirectory;
+*/
 
 /* Stock objects */
 wxFont *wxNORMAL_FONT;
@@ -122,7 +126,6 @@ wxBrush    wxNullBrush;
 wxFont     wxNullFont;
 wxColour   wxNullColour;
 wxPalette  wxNullPalette; 
-wxRegion   wxNullRegion; 
 
 /* Default window names */
 const char *wxButtonNameStr = "button";