STL-ification patch for wxMSW and wxGTK.

[wxWidgets.git] / include / wx / univ / toplevel.h

diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index 1c4811f37b0b40a6b1fd5ceec75b50f66fc92746..e9265722ee85ad9ae3596e8630ed072887f09394 100644 (file)
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -17,6 +17,7 @@
 
 #include "wx/univ/inpcons.h"
 #include "wx/univ/inphand.h"
+#include "wx/icon.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -35,7 +36,7 @@ enum
     wxTOPLEVEL_BUTTON_MAXIMIZE = 0x02000000,
     wxTOPLEVEL_BUTTON_ICONIZE =  0x04000000,
     wxTOPLEVEL_BUTTON_RESTORE  = 0x08000000,
-    wxTOPLEVEL_BUTTON_HELP     = 0x10000000,
+    wxTOPLEVEL_BUTTON_HELP     = 0x10000000
 };
 
 // frame hit test return values:
@@ -123,7 +124,8 @@ public:
     virtual wxPoint GetClientAreaOrigin() const;
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
-    virtual void SetIcon(const wxIcon& icon);
+    virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }
+    virtual void SetIcons(const wxIconBundle& icons);
 
     // implementation from now on
     // --------------------------
@@ -141,6 +143,8 @@ public:
     virtual int GetMinWidth() const;
     virtual int GetMinHeight() const;
 
+    virtual bool ProvidesBackground() const { return TRUE; }
+    
 protected:
     // handle titlebar button click event
     virtual void ClickTitleBarButton(long button);