Compilation fix.

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

diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h
index ac50971747fedcb3ac8c1b3749615f11172d46a4..ae820864c24de279e02b0b25b8eb9b34220f1d0d 100644 (file)
--- a/include/wx/x11/toplevel.h
+++ b/include/wx/x11/toplevel.h
@@ -50,7 +50,6 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;

-    virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }

     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 


@@ -70,6 +69,12 @@ public:
 
     virtual bool SetShape(const wxRegion& region);
 
 
     virtual bool SetShape(const wxRegion& region);
 

+    // For implementation purposes - sometimes decorations make the
+    // client area smaller
+    virtual wxPoint GetClientAreaOrigin() const;
+
+    virtual void OnInternalIdle();
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -77,13 +82,8 @@ protected:
     // set the icon for the window
     void DoSetIcon( const wxIcon& icon );
 
     // 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;
-

     // For implementation of delayed resize events
     bool m_needResizeInIdle;
     // For implementation of delayed resize events
     bool m_needResizeInIdle;

-    virtual void OnInternalIdle();

 
     virtual void DoGetClientSize( int *width, int *height ) const;
     virtual void DoGetSize( int *width, int *height ) const;
 
     virtual void DoGetClientSize( int *width, int *height ) const;
     virtual void DoGetSize( int *width, int *height ) const;