Commit mentioned fix/hack to enable controls

[wxWidgets.git] / src / x11 / toplevel.cpp

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 84ce7c9694651f95a0c630fb591a723d03b46837..7fcd2b9894ca1036389d8c1d971717e2845e1244 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "toplevel.h"
 #endif
 
     #pragma implementation "toplevel.h"
 #endif
 


@@ -139,7 +139,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
         xattributes.override_redirect = True;
     }
     
         xattributes.override_redirect = True;
     }
     

-    if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ))
+    if (!HasFlag( wxFULL_REPAINT_ON_RESIZE ))

     {
         xattributes_mask |= CWBitGravity;
         xattributes.bit_gravity = NorthWestGravity;
     {
         xattributes_mask |= CWBitGravity;
         xattributes.bit_gravity = NorthWestGravity;


@@ -248,7 +248,7 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
     wxTopLevelWindows.DeleteObject(this);
 
     // If this is the last top-level window, exit.
     wxTopLevelWindows.DeleteObject(this);
 
     // If this is the last top-level window, exit.

-    if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
+    if ( wxTheApp && (wxTopLevelWindows.GetCount() == 0) )

     {
         wxTheApp->SetTopWindow(NULL);
 
     {
         wxTheApp->SetTopWindow(NULL);
 


@@ -404,6 +404,13 @@ void wxTopLevelWindowX11::SetIcons(const wxIconBundle& icons )
     wxSetIconsX11( wxGlobalDisplay(), GetMainWindow(), icons );
 }
 
     wxSetIconsX11( wxGlobalDisplay(), GetMainWindow(), icons );
 }
 

+bool wxTopLevelWindowX11::SetShape(const wxRegion& region)
+{
+    return wxDoSetShape( wxGlobalDisplay(),
+                         (Window)GetMainWindow(),
+                         region );
+}
+

 void wxTopLevelWindowX11::SetTitle(const wxString& title)
 {
     m_title = title;
 void wxTopLevelWindowX11::SetTitle(const wxString& title)
 {
     m_title = title;


@@ -677,7 +684,7 @@ bool wxSetWMDecorations(Window w, long style)
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
 
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
 

-    if (style & wxCLOSE)
+    if (style & wxCLOSE_BOX)

     {
         wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
     {
         wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
         wmProp.flags |= GR_WM_FLAGS_PROPS ;


@@ -753,7 +760,7 @@ bool wxSetWMDecorations(Window w, long style)
         if ((style & wxSYSTEM_MENU) != 0)
             hints.decorations |= MWM_DECOR_MENU;
         
         if ((style & wxSYSTEM_MENU) != 0)
             hints.decorations |= MWM_DECOR_MENU;
         

-        if ((style & wxCLOSE) != 0)
+        if ((style & wxCLOSE_BOX) != 0)

             hints.functions |= MWM_FUNC_CLOSE;
         
         if ((style & wxMINIMIZE_BOX) != 0)
             hints.functions |= MWM_FUNC_CLOSE;
         
         if ((style & wxMINIMIZE_BOX) != 0)