Added dde sample; added docs/index.htm

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index fe995f30a5817d2d029ebec659de6716fd7bc451..9ea245de1c7052ddd716d03a28e889faadfb084e 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -156,6 +156,7 @@ class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxPalette;
 class WXDLLEXPORT wxPalette;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxPalette;
 class WXDLLEXPORT wxPalette;

+class WXDLLEXPORT wxRegion;

 
 /*
  * Bitmap flags
 
 /*
  * Bitmap flags


@@ -302,6 +303,9 @@ WXDLLEXPORT_DATA(extern wxBrush)            wxNullBrush;
 WXDLLEXPORT_DATA(extern wxPalette)             wxNullPalette;
 WXDLLEXPORT_DATA(extern wxFont)                wxNullFont;
 WXDLLEXPORT_DATA(extern wxColour)              wxNullColour;
 WXDLLEXPORT_DATA(extern wxPalette)             wxNullPalette;
 WXDLLEXPORT_DATA(extern wxFont)                wxNullFont;
 WXDLLEXPORT_DATA(extern wxColour)              wxNullColour;

+#ifdef __WXGTK__
+WXDLLEXPORT_DATA(extern wxRegion)              wxNullRegion;
+#endif

 
 // Stock cursors types
 WXDLLEXPORT_DATA(extern wxCursor*)             wxSTANDARD_CURSOR;
 
 // Stock cursors types
 WXDLLEXPORT_DATA(extern wxCursor*)             wxSTANDARD_CURSOR;


@@ -353,11 +357,13 @@ extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
 
 class WXDLLEXPORT wxResourceCache: public wxList
 {
 
 class WXDLLEXPORT wxResourceCache: public wxList
 {

-  DECLARE_DYNAMIC_CLASS(wxResourceCache)
- public:
-   wxResourceCache();
-   wxResourceCache(const unsigned int the_key_type);
-   ~wxResourceCache();
+public:
+    wxResourceCache() { }
+    wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
+    ~wxResourceCache();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxResourceCache)

 };
 
 #endif
 };
 
 #endif