missing commit

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index eae804059de8a18612b624e26c02efab79132a5f..36804b3ae656a5dbeaedfaf6fe52e088979f2179 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -6,7 +6,7 @@
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Julian Smart
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Julian Smart

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -24,18 +24,19 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/toplevel.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/toplevel.h"

     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/statusbr.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/statusbr.h"

+    #include "wx/settings.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/settings.h"

 #include "wx/x11/private.h"
 #include "X11/Xutil.h"
 
 #include "wx/x11/private.h"
 #include "X11/Xutil.h"
 


@@ -197,9 +198,9 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     {
        if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
        {
     {
        if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
        {

-            if (GetParent() && GetParent()->GetMainWindow())
+            if (GetParent() && GetParent()->X11GetMainWindow())

             {
             {

-                Window xparentwindow = (Window) GetParent()->GetMainWindow();
+                Window xparentwindow = (Window) GetParent()->X11GetMainWindow();

                 XSetTransientForHint( xdisplay, xwindow, xparentwindow );
             }
         }
                 XSetTransientForHint( xdisplay, xwindow, xparentwindow );
             }
         }


@@ -219,7 +220,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     if (GetParent())
     {
         wm_hints.flags |= WindowGroupHint;
     if (GetParent())
     {
         wm_hints.flags |= WindowGroupHint;

-        wm_hints.window_group = (Window) GetParent()->GetMainWindow();
+        wm_hints.window_group = (Window) GetParent()->X11GetMainWindow();

     }
     wm_hints.input = True;
     wm_hints.initial_state = NormalState;
     }
     wm_hints.input = True;
     wm_hints.initial_state = NormalState;


@@ -267,7 +268,7 @@ void wxTopLevelWindowX11::OnInternalIdle()
     {
         wxSizeEvent event( GetClientSize(), GetId() );
         event.SetEventObject( this );
     {
         wxSizeEvent event( GetClientSize(), GetId() );
         event.SetEventObject( this );

-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );

 
         m_needResizeInIdle = false;
     }
 
         m_needResizeInIdle = false;
     }


@@ -284,7 +285,7 @@ bool wxTopLevelWindowX11::Show(bool show)
         wxSizeEvent event(GetSize(), GetId());
 
         event.SetEventObject(this);
         wxSizeEvent event(GetSize(), GetId());
 
         event.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);

 
         m_needResizeInIdle = false;
     }
 
         m_needResizeInIdle = false;
     }


@@ -298,7 +299,7 @@ bool wxTopLevelWindowX11::Show(bool show)
 // wxTopLevelWindowX11 maximize/minimize
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowX11 maximize/minimize
 // ----------------------------------------------------------------------------
 

-void wxTopLevelWindowX11::Maximize(bool maximize)
+void wxTopLevelWindowX11::Maximize(bool WXUNUSED(maximize))

 {
     // TODO
 }
 {
     // TODO
 }


@@ -311,10 +312,16 @@ bool wxTopLevelWindowX11::IsMaximized() const
 
 void wxTopLevelWindowX11::Iconize(bool iconize)
 {
 
 void wxTopLevelWindowX11::Iconize(bool iconize)
 {

-    if (!m_iconized && GetMainWindow())
+    if ( !iconize )
+    {
+        Restore();
+        return;
+    }
+
+    if (!m_iconized && X11GetMainWindow())

     {
         if (XIconifyWindow(wxGlobalDisplay(),
     {
         if (XIconifyWindow(wxGlobalDisplay(),

-            (Window) GetMainWindow(), DefaultScreen(wxGlobalDisplay())) != 0)
+            (Window) X11GetMainWindow(), DefaultScreen(wxGlobalDisplay())) != 0)

             m_iconized = true;
     }
 }
             m_iconized = true;
     }
 }


@@ -327,9 +334,9 @@ bool wxTopLevelWindowX11::IsIconized() const
 void wxTopLevelWindowX11::Restore()
 {
     // This is the way to deiconify the window, according to the X FAQ
 void wxTopLevelWindowX11::Restore()
 {
     // This is the way to deiconify the window, according to the X FAQ

-    if (m_iconized && GetMainWindow())
+    if (m_iconized && X11GetMainWindow())

     {
     {

-        XMapWindow(wxGlobalDisplay(), (Window) GetMainWindow());
+        XMapWindow(wxGlobalDisplay(), (Window) X11GetMainWindow());

         m_iconized = false;
     }
 }
         m_iconized = false;
     }
 }


@@ -370,10 +377,9 @@ bool wxTopLevelWindowX11::ShowFullScreen(bool show, long style)
 
 void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon)
 {
 
 void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon)
 {

-    if (icon.Ok() && GetMainWindow())
+    if (icon.IsOk() && X11GetMainWindow())

     {
     {

-#if wxUSE_NANOX
-#else
+#if !wxUSE_NANOX

         XWMHints *wmHints = XAllocWMHints();
         wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();
 
         XWMHints *wmHints = XAllocWMHints();
         wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();
 


@@ -385,7 +391,7 @@ void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon)
             wmHints->icon_mask = (Pixmap) icon.GetMask()->GetBitmap();
         }
 
             wmHints->icon_mask = (Pixmap) icon.GetMask()->GetBitmap();
         }
 

-        XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints);
+        XSetWMHints(wxGlobalDisplay(), (Window) X11GetMainWindow(), wmHints);

         XFree(wmHints);
 #endif
     }
         XFree(wmHints);
 #endif
     }


@@ -397,13 +403,13 @@ void wxTopLevelWindowX11::SetIcons(const wxIconBundle& icons )
     wxTopLevelWindowBase::SetIcons( icons );
 
     DoSetIcon( icons.GetIcon( -1 ) );
     wxTopLevelWindowBase::SetIcons( icons );
 
     DoSetIcon( icons.GetIcon( -1 ) );

-    wxSetIconsX11( wxGlobalDisplay(), GetMainWindow(), icons );
+    wxSetIconsX11( wxGlobalDisplay(), X11GetMainWindow(), icons );

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

-                         (Window)GetMainWindow(),
+                         (Window)X11GetMainWindow(),

                          region );
 }
 
                          region );
 }
 


@@ -411,18 +417,18 @@ void wxTopLevelWindowX11::SetTitle(const wxString& title)
 {
     m_title = title;
 
 {
     m_title = title;
 

-    if (GetMainWindow())
+    if (X11GetMainWindow())

     {
 #if wxUSE_UNICODE
         //  I wonder of e.g. Metacity takes UTF-8 here
     {
 #if wxUSE_UNICODE
         //  I wonder of e.g. Metacity takes UTF-8 here

-        XStoreName(wxGlobalDisplay(), (Window) GetMainWindow(),
+        XStoreName(wxGlobalDisplay(), (Window) X11GetMainWindow(),

             (const char*) title.ToAscii() );
             (const char*) title.ToAscii() );

-        XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
+        XSetIconName(wxGlobalDisplay(), (Window) X11GetMainWindow(),

             (const char*) title.ToAscii() );
 #else
             (const char*) title.ToAscii() );
 #else

-        XStoreName(wxGlobalDisplay(), (Window) GetMainWindow(),
+        XStoreName(wxGlobalDisplay(), (Window) X11GetMainWindow(),

             (const char*) title);
             (const char*) title);

-        XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
+        XSetIconName(wxGlobalDisplay(), (Window) X11GetMainWindow(),

             (const char*) title);
 #endif
     }
             (const char*) title);
 #endif
     }


@@ -478,7 +484,7 @@ void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
     size_hints.flags = PSize;
     size_hints.width = width;
     size_hints.height = height;
     size_hints.flags = PSize;
     size_hints.width = width;
     size_hints.height = height;

-    XSetWMNormalHints( wxGlobalDisplay(), (Window) GetMainWindow(), &size_hints );
+    XSetWMNormalHints( wxGlobalDisplay(), (Window) X11GetMainWindow(), &size_hints );

 #endif
 
     wxWindowX11::DoSetClientSize(width, height);
 #endif
 
     wxWindowX11::DoSetClientSize(width, height);


@@ -517,7 +523,7 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz
     size_hints.y = m_y;
     size_hints.width = m_width;
     size_hints.height = m_height;
     size_hints.y = m_y;
     size_hints.width = m_width;
     size_hints.height = m_height;

-    XSetWMNormalHints( wxGlobalDisplay(), (Window) GetMainWindow(), &size_hints);
+    XSetWMNormalHints( wxGlobalDisplay(), (Window) X11GetMainWindow(), &size_hints);

 #endif
 
     wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
 #endif
 
     wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);


@@ -687,8 +693,7 @@ bool wxSetWMDecorations(Window w, long style)
     }
 
     if ((style & wxCAPTION) ||
     }
 
     if ((style & wxCAPTION) ||

-        (style & wxTINY_CAPTION_HORIZ) ||
-        (style & wxTINY_CAPTION_VERT))
+        (style & wxTINY_CAPTION))

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


@@ -696,10 +701,10 @@ bool wxSetWMDecorations(Window w, long style)
         // The default dialog style doesn't include any kind
         // of border, which is a bit odd. Anyway, inclusion
         // of a caption surely implies a border.
         // The default dialog style doesn't include any kind
         // of border, which is a bit odd. Anyway, inclusion
         // of a caption surely implies a border.

-        style |= wxTHICK_FRAME;
+        style |= wxRESIZE_BORDER;

     }
 
     }
 

-    if (style & wxTHICK_FRAME)
+    if (style & wxRESIZE_BORDER)

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


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

-    if (((style & wxBORDER) != wxBORDER) && ((style & wxTHICK_FRAME) != wxTHICK_FRAME)
-        && ((style & wxRESIZE_BORDER) != wxRESIZE_BORDER))
+    if ( !(style & wxBORDER) && !(style & wxRESIZE_BORDER) )

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