guard code for mac / quickdraw

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 58248bf16fd686b373b5423ec6f571cea0e18eba..384b7ae317f1085a9980ac580acc72eda1c0fee9 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -299,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
 }


@@ -312,6 +312,12 @@ bool wxTopLevelWindowX11::IsMaximized() const
 
 void wxTopLevelWindowX11::Iconize(bool iconize)
 {
 
 void wxTopLevelWindowX11::Iconize(bool iconize)
 {

+    if ( !iconize )
+    {
+        Restore();
+        return;
+    }
+

     if (!m_iconized && GetMainWindow())
     {
         if (XIconifyWindow(wxGlobalDisplay(),
     if (!m_iconized && GetMainWindow())
     {
         if (XIconifyWindow(wxGlobalDisplay(),


@@ -373,8 +379,7 @@ void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon)
 {
     if (icon.Ok() && GetMainWindow())
     {
 {
     if (icon.Ok() && GetMainWindow())
     {

-#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();