Remove wrong clasing bracket.

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

diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h
index 4ca3ac2df1b4df41dde43328a61b410b7f062325..63ac8769fd5733616e5f4628dcbf27df3db0cdd7 100644 (file)
--- a/include/wx/x11/toplevel.h
+++ b/include/wx/x11/toplevel.h
@@ -12,7 +12,7 @@
 #ifndef _WX_X11_TOPLEVEL_H_
 #define _WX_X11_TOPLEVEL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "toplevel.h"
 #endif
 
@@ -54,7 +54,8 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = TRUE);
     virtual bool IsIconized() const;
-    virtual void SetIcon(const wxIcon& icon);
+    virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }
+    virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
     virtual bool Show( bool show = TRUE );
@@ -66,12 +67,20 @@ public:
     virtual wxString GetTitle() const;
     
     // implementation
-    void SetNeedResizeInIdle( bool set = TRUE ) { m_needResizeInIdle = set; }
+    void SetNeedResizeInIdle( bool set = TRUE )
+        { m_needResizeInIdle = set; }
+    void SetConfigureGeometry( int x, int y, int width, int height )
+        { m_x = x; m_y = y; m_width = width; m_height = height; }
+
+    virtual bool SetShape(const wxRegion& region);
     
 protected:
     // common part of all ctors
     void Init();
 
+    // set the icon for the window
+    void DoSetIcon( const wxIcon& icon );
+
     // For implementation purposes - sometimes decorations make the
     // client area smaller
     virtual wxPoint GetClientAreaOrigin() const;
@@ -81,6 +90,7 @@ protected:
     virtual void OnInternalIdle();
 
     virtual void DoGetClientSize( int *width, int *height ) const;
+    virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoSetClientSize(int width, int height);
     virtual void DoSetSize(int x, int y,
         int width, int height,
@@ -100,6 +110,9 @@ protected:
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
     wxString              m_title;
+    
+    // Geometry
+    int                   m_x,m_y,m_width,m_height;
 };
 
 // list of all frames and modeless dialogs