removed obsolete wxUSE_CTL3D

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

diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h
index 013d3a2909c64dc296e3ffe1ab90cdeb2992b292..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_
 
 #ifndef _WX_X11_TOPLEVEL_H_
 #define _WX_X11_TOPLEVEL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "toplevel.h"
 #endif
 
     #pragma interface "toplevel.h"
 #endif
 


@@ -71,6 +71,8 @@ public:
         { 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; }
         { 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
     
 protected:
     // common part of all ctors


@@ -79,8 +81,6 @@ protected:
     // set the icon for the window
     void DoSetIcon( const wxIcon& icon );
 
     // set the icon for the window
     void DoSetIcon( const wxIcon& icon );
 

-    virtual bool SetShape(const wxRegion& region);
-

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