attempts to fix separate compilation (didn't work)

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index d1a58623b7305e0bd93258a6d04d92db14aa25d1..cc51c2100111ca1080d9201995f780b617df371b 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -248,7 +248,7 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
     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);
 
@@ -264,7 +264,10 @@ void wxTopLevelWindowX11::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
     
-    if (m_needResizeInIdle)
+    // Do this only after the last idle event so that
+    // all windows have been updated before a new
+    // round of size events is sent
+    if (m_needResizeInIdle && !wxTheApp->Pending())
     {
         wxSizeEvent event( GetClientSize(), GetId() );
         event.SetEventObject( this );
@@ -280,31 +283,15 @@ void wxTopLevelWindowX11::OnInternalIdle()
 
 bool wxTopLevelWindowX11::Show(bool show)
 {
-    // Nano-X has to force a size event,
-    // else there's no initial size.
-#if wxUSE_NANOX
     if (show)
-#else
-    if (show && m_needResizeInIdle)
-#endif
     {
         wxSizeEvent event(GetSize(), GetId());
+        
         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);
         
         m_needResizeInIdle = FALSE;
     }
-    if (show)
-    {
-        // This does the layout _before_ the
-        // window is shown, else the items are
-        // drawn first at the wrong positions,
-        // then at the correct positions.
-        if (GetAutoLayout())
-        {
-            Layout();
-        }
-    }
 
     bool ret = wxWindowX11::Show(show);
     
@@ -417,16 +404,31 @@ void wxTopLevelWindowX11::SetIcons(const wxIconBundle& 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;
     
     if (GetMainWindow())
     {
+#if wxUSE_UNICODE
+        //  I wonder of e.g. Metacity takes UTF-8 here
+        XStoreName(wxGlobalDisplay(), (Window) GetMainWindow(),
+            (const char*) title.ToAscii() );
+        XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
+            (const char*) title.ToAscii() );
+#else
         XStoreName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);
         XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);
+#endif
     }
 }
 
@@ -452,13 +454,29 @@ void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
        *height = m_height;
 }
 
+void wxTopLevelWindowX11::DoGetSize( int *width, int *height ) const
+{
+    // TODO add non-client size
+
+    if (width)
+       *width = m_width;
+    if (height)
+       *height = m_height;
+}
+
 void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
 {
-    // wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height);
-    
+    int old_width = m_width;
+    int old_height = m_height;
+
     m_width = width;
     m_height = height;
     
+    if (m_width == old_width && m_height == old_height)
+        return;
+        
+    // wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height);
+    
 #if !wxUSE_NANOX
     XSizeHints size_hints;
     size_hints.flags = PSize;
@@ -472,7 +490,10 @@ void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
 
 void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
-    // wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height);
+    int old_x = m_x;
+    int old_y = m_y;
+    int old_width = m_width;
+    int old_height = m_height;
 
     if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
         m_x = x;
@@ -485,7 +506,12 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz
         
     if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
         m_height = height;
+        
+    if (m_x == old_x && m_y == old_y && m_width == old_width && m_height == old_height)
+        return;
     
+    // wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height);
+
 #if !wxUSE_NANOX    
     XSizeHints size_hints;
     size_hints.flags = 0;
@@ -658,7 +684,7 @@ bool wxSetWMDecorations(Window w, long style)
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
 
-    if (style & wxSYSTEM_MENU)
+    if (style & wxCLOSE_BOX)
     {
         wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
@@ -732,10 +758,10 @@ bool wxSetWMDecorations(Window w, long style)
             hints.decorations |= MWM_DECOR_TITLE;
             
         if ((style & wxSYSTEM_MENU) != 0)
-        {
-            hints.functions |= MWM_FUNC_CLOSE;
             hints.decorations |= MWM_DECOR_MENU;
-        }
+        
+        if ((style & wxCLOSE_BOX) != 0)
+            hints.functions |= MWM_FUNC_CLOSE;
         
         if ((style & wxMINIMIZE_BOX) != 0)
         {