DP: native wxTreeCtrl for GTK.

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index dec74b5bb9136c100f0423cf702b0e82ff0ed79f..93320b4b3f1dc7db9f36632178d30e5ff5aa1a2b 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -21,12 +21,14 @@
 #include "wx/hash.h"
 #include "wx/setup.h"
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "wx/msw/colour.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/colour.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/colour.h"
+#elif defined(__WXQT__)
+#include "wx/qt/colour.h"
 #endif
 
 // Standard cursors
@@ -98,7 +100,7 @@ class WXDLLEXPORT wxRealPoint
 class WXDLLEXPORT wxPoint
 {
  public:
-#if defined(__WINDOWS__) && !defined(__WIN32__)
+#if defined(__WXMSW__) && !defined(__WIN32__)
   int x;
   int y;
 #else
@@ -315,7 +317,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();
 
@@ -330,7 +334,7 @@ extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
 
 // Useful macro for create icons portably
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 # define wxICON(X) wxIcon(X##_icon);
 #elif defined(__X__)
 # define wxICON(X) wxIcon(X##_bits, X##_width, X##_height);
@@ -345,5 +349,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__