fix for always terminating intermediate UniChar String for 4 bytes wchar_t

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index eb297ec92d6b3d3f9cafbf3d163afcee535a5770..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);
 


@@ -264,7 +264,10 @@ void wxTopLevelWindowX11::OnInternalIdle()
 {
     wxWindow::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 );
     {
         wxSizeEvent event( GetClientSize(), GetId() );
         event.SetEventObject( this );


@@ -280,31 +283,15 @@ void wxTopLevelWindowX11::OnInternalIdle()
 
 bool wxTopLevelWindowX11::Show(bool show)
 {
 
 bool wxTopLevelWindowX11::Show(bool show)
 {

-    // Nano-X has to force a size event,
-    // else there's no initial size.
-#if wxUSE_NANOX

     if (show)
     if (show)

-#else
-    if (show && m_needResizeInIdle)
-#endif

     {
         wxSizeEvent event(GetSize(), GetId());
     {
         wxSizeEvent event(GetSize(), GetId());

+        

         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);
         
         m_needResizeInIdle = FALSE;
     }
         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);
     
 
     bool ret = wxWindowX11::Show(show);
     


@@ -417,16 +404,31 @@ 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;
     
     if (GetMainWindow())
     {
 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);
         XStoreName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);
         XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);

+#endif

     }
 }
 
     }
 }
 


@@ -682,7 +684,7 @@ bool wxSetWMDecorations(Window w, long style)
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
 
         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 ;
     {
         wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
         wmProp.flags |= GR_WM_FLAGS_PROPS ;


@@ -756,10 +758,10 @@ bool wxSetWMDecorations(Window w, long style)
             hints.decorations |= MWM_DECOR_TITLE;
             
         if ((style & wxSYSTEM_MENU) != 0)
             hints.decorations |= MWM_DECOR_TITLE;
             
         if ((style & wxSYSTEM_MENU) != 0)

-        {
-            hints.functions |= MWM_FUNC_CLOSE;

             hints.decorations |= MWM_DECOR_MENU;
             hints.decorations |= MWM_DECOR_MENU;

-        }
+        
+        if ((style & wxCLOSE_BOX) != 0)
+            hints.functions |= MWM_FUNC_CLOSE;

         
         if ((style & wxMINIMIZE_BOX) != 0)
         {
         
         if ((style & wxMINIMIZE_BOX) != 0)
         {