X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36b3b54ad8431bca0fa53fa8acae5ba6d4c3e9c7..511327386bec5645785dabd22dfda448e17b5363:/src/gtk/data.cpp diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp index 8a6969b3a9..57e16d0916 100644 --- a/src/gtk/data.cpp +++ b/src/gtk/data.cpp @@ -33,11 +33,17 @@ XrmDatabase wxResourceDatabase; char *wxBuffer = (char *) NULL; /* Windows List */ -wxList wxTopLevelWindows; +wxWindowList wxTopLevelWindows; /* List of windows pending deletion */ wxList wxPendingDelete; +#if wxUSE_THREADS +/* List of events pending processing */ +wxList wxPendingEvents; +wxCriticalSection wxPendingEventsLocker; +#endif + /* 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; -wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase *) NULL; + +// Now in prntbase.cpp +// wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase *) 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; - + /* X only font names */ /* wxFontNameDirectory *wxTheFontNameDirectory; @@ -103,7 +111,7 @@ wxBrush *wxLIGHT_GREY_BRUSH; wxColour *wxBLACK; wxColour *wxWHITE; -wxColour *wxGREY; +wxColour *wxGREY; wxColour *wxRED; wxColour *wxBLUE; wxColour *wxGREEN; @@ -117,14 +125,13 @@ wxCursor *wxCROSS_CURSOR = (wxCursor *) NULL; /* 'Null' objects */ wxAcceleratorTable wxNullAcceleratorTable; wxBitmap wxNullBitmap; -wxIcon wxNullIcon; +wxIcon wxNullIcon; wxCursor wxNullCursor; wxPen wxNullPen; wxBrush wxNullBrush; wxFont wxNullFont; wxColour wxNullColour; -wxPalette wxNullPalette; -wxRegion wxNullRegion; +wxPalette wxNullPalette; /* Default window names */ const char *wxButtonNameStr = "button";