wxGTK's built-in dockable menu now give their

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

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index 324dc713bcac05e126eef337a5973a30ff8aa4da..ad7aff2b3a48bb2ee02f0e944423d7f481a6842f 100644 (file)
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -33,11 +33,17 @@ XrmDatabase wxResourceDatabase;
 char *wxBuffer = (char *) NULL;
 
 /* Windows List */
 char *wxBuffer = (char *) NULL;
 
 /* Windows List */

-wxList wxTopLevelWindows;
+wxWindowList wxTopLevelWindows;

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

+#if wxUSE_THREADS
+/* List of events pending processing */
+wxList *wxPendingEvents = NULL;
+wxCriticalSection *wxPendingEventsLocker = NULL;
+#endif
+

 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
 wxCursor *g_globalCursor = (wxCursor *) NULL;
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
 wxCursor *g_globalCursor = (wxCursor *) NULL;


@@ -59,7 +65,9 @@ char *wxOsVersion = (char *) NULL;
 
 /* For printing several pages */
 int wxPageNumber;
 
 /* 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;
 
 /* GDI Object Lists */
 wxBrushList      *wxTheBrushList = (wxBrushList *) NULL;


@@ -67,7 +75,7 @@ wxPenList        *wxThePenList = (wxPenList *) NULL;
 wxFontList       *wxTheFontList = (wxFontList *) NULL;
 wxColourDatabase *wxTheColourDatabase = (wxColourDatabase *) NULL;
 wxBitmapList     *wxTheBitmapList = (wxBitmapList *) NULL;
 wxFontList       *wxTheFontList = (wxFontList *) NULL;
 wxColourDatabase *wxTheColourDatabase = (wxColourDatabase *) NULL;
 wxBitmapList     *wxTheBitmapList = (wxBitmapList *) NULL;

-  
+

 /* X only font names */
 /*
 wxFontNameDirectory *wxTheFontNameDirectory;
 /* X only font names */
 /*
 wxFontNameDirectory *wxTheFontNameDirectory;


@@ -103,7 +111,7 @@ wxBrush *wxLIGHT_GREY_BRUSH;
 
 wxColour *wxBLACK;
 wxColour *wxWHITE;
 
 wxColour *wxBLACK;
 wxColour *wxWHITE;

-wxColour *wxGREY; 
+wxColour *wxGREY;

 wxColour *wxRED;
 wxColour *wxBLUE;
 wxColour *wxGREEN;
 wxColour *wxRED;
 wxColour *wxBLUE;
 wxColour *wxGREEN;


@@ -117,13 +125,13 @@ wxCursor *wxCROSS_CURSOR = (wxCursor *) NULL;
 /* 'Null' objects */
 wxAcceleratorTable   wxNullAcceleratorTable;
 wxBitmap   wxNullBitmap;
 /* 'Null' objects */
 wxAcceleratorTable   wxNullAcceleratorTable;
 wxBitmap   wxNullBitmap;

-wxIcon     wxNullIcon;  
+wxIcon     wxNullIcon;

 wxCursor   wxNullCursor;
 wxPen      wxNullPen;
 wxBrush    wxNullBrush;
 wxFont     wxNullFont;
 wxColour   wxNullColour;
 wxCursor   wxNullCursor;
 wxPen      wxNullPen;
 wxBrush    wxNullBrush;
 wxFont     wxNullFont;
 wxColour   wxNullColour;

-wxPalette  wxNullPalette; 
+wxPalette  wxNullPalette;

 
 /* Default window names */
 const char *wxButtonNameStr = "button";
 
 /* Default window names */
 const char *wxButtonNameStr = "button";