ifdef out some wxGTK specific code

[wxWidgets.git] / include / wx / gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index f0b52eefdee26de52d80cfe055c12a5e07e9cd4f..17517cce8a39808b1ddc31358019d0af002b453a 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GDICMNH__
-#define __GDICMNH__
+#ifndef _WX_GDICMNH__
+#define _WX_GDICMNH__
 
 #ifdef __GNUG__
 #pragma interface "gdicmn.h"
@@ -19,15 +19,9 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/hash.h"
+#include "wx/string.h"
 #include "wx/setup.h"
-
-#ifdef __WXMSW__
-#include "wx/msw/colour.h"
-#elif defined(__WXMOTIF__)
-#include "wx/xt/colour.h"
-#elif defined(__WXGTK__)
-#include "wx/gtk/colour.h"
-#endif
+#include "wx/colour.h"
 
 // Standard cursors
 typedef enum {
@@ -190,6 +184,8 @@ class WXDLLEXPORT wxPalette;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxIcon;
+class WXDLLEXPORT wxColour;
+class WXDLLEXPORT wxString;
 
 // Management of pens, brushes and fonts
 class WXDLLEXPORT wxPenList: public wxList
@@ -315,7 +311,9 @@ WXDLLEXPORT_DATA(extern wxCursor*)          wxCROSS_CURSOR;
 
 WXDLLEXPORT_DATA(extern wxColourDatabase*)     wxTheColourDatabase;
 extern void WXDLLEXPORT wxInitializeStockObjects();
+extern void WXDLLEXPORT wxInitializeStockLists();
 extern void WXDLLEXPORT wxDeleteStockObjects();
+extern void WXDLLEXPORT wxDeleteStockLists();
 
 extern bool WXDLLEXPORT wxColourDisplay();
 
@@ -345,5 +343,14 @@ extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
   wxIcon *icon = new wxICON(wxbuild);
  */
 
+class WXDLLEXPORT wxResourceCache: public wxList
+{
+  DECLARE_DYNAMIC_CLASS(wxResourceCache)
+ public:
+   wxResourceCache();
+   wxResourceCache(const unsigned int the_key_type);
+   ~wxResourceCache();
+};
+
 #endif
-    // __GDICMNH__
+    // _WX_GDICMNH__