fixed warnings about main used as a variable name

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

diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index c7bf590b523359374e01958efaab4a979903c6bb..1f4a35c268d6317557e6b7ba0f25cd27b2c1f38a 100644 (file)
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -54,6 +54,7 @@ public:
     virtual void Iconize(bool iconize = TRUE);
     virtual bool IsIconized() const;
     virtual void SetIcon(const wxIcon& icon);
+    virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
@@ -71,6 +72,9 @@ public:
     // from both DoSetSize() and DoSetClientSize()
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
+    // set the icon for this window
+    void DoSetIcon( const wxIcon& icon );
+
     // GTK callbacks
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
@@ -88,13 +92,18 @@ public:
     long          m_fsSaveGdkFunc, m_fsSaveGdkDecor;
     long          m_fsSaveFlag;
     wxRect        m_fsSaveFrame;
-    
-    long          m_gdkFunc, m_gdkDecor; // m_windowStyle translated to GDK's terms
+
+    // m_windowStyle translated to GDK's terms
+    long          m_gdkFunc,
+                  m_gdkDecor;
 
 protected:
     // common part of all ctors
     void Init();
 
+    // focus event handler
+    void OnSetFocus(wxFocusEvent& event);
+
     // override wxWindow methods to take into account tool/menu/statusbars
     virtual void DoSetSize(int x, int y,
                            int width, int height,
@@ -105,6 +114,8 @@ protected:
 
     // is the frame currently iconized?
     bool m_isIconized;
+
+    DECLARE_EVENT_TABLE()
 };
 
 #endif // __GTKTOPLEVELH__