Added wxUSE_TOOLBOOK

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

diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index ed977de59e1ff1dd52bfdb1fc8bc07b485dcaa68..7193a7c5e874187bc56ab47433cb993f8ebb154c 100644 (file)
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -11,12 +11,9 @@
 #ifndef __WX_UNIV_TOPLEVEL_H__
 #define __WX_UNIV_TOPLEVEL_H__
 
-#ifdef __GNUG__
-    #pragma interface "univtoplevel.h"
-#endif
-
 #include "wx/univ/inpcons.h"
 #include "wx/univ/inphand.h"
+#include "wx/icon.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -35,7 +32,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 +120,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
     // --------------------------
@@ -154,11 +152,12 @@ protected:
     void Init();
 
     void RefreshTitleBar();
-    void OnNcPaint(wxPaintEvent& event);
+    void OnNcPaint(wxNcPaintEvent& event);
+    void OnSystemMenu(wxCommandEvent& event);
 
-    // TRUE if wxTLW should render decorations (aka titlebar) itself
+    // true if wxTLW should render decorations (aka titlebar) itself
     static int ms_drawDecorations;
-    // TRUE if wxTLW can be iconized
+    // true if wxTLW can be iconized
     static int ms_canIconize;
     // true for currently active frame
     bool m_isActive:1;