more things are done by configure: checks for bool, whether overloading based

[wxWidgets.git] / src / gtk1 / frame.cpp

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 9b422b1b2d579ce210fe0b4052c444ad33c22fc9..18335cfef9ebee019dcbbe3be47a88d58d2fd2a2 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -297,10 +297,10 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))

-       {
+        {

             /* m_sizeSet = FALSE; */
             /* m_sizeSet = FALSE; */

-           gtk_widget_set_uposition( m_widget, m_x, m_y );
-       }
+            gtk_widget_set_uposition( m_widget, m_x, m_y );
+        }

     }
 
     if ((m_width != old_width) || (m_height != old_height))
     }
 
     if ((m_width != old_width) || (m_height != old_height))


@@ -361,7 +361,7 @@ void wxFrame::DoSetClientSize( int width, int height )
         m_frameToolBar->GetSize( (int *) NULL, &y );
         h += y;
     }
         m_frameToolBar->GetSize( (int *) NULL, &y );
         h += y;
     }

-    wxWindow::SetClientSize( width + m_miniEdge*2, h  + m_miniEdge*2 + m_miniTitle );
+    wxWindow::DoSetClientSize( width + m_miniEdge*2, h  + m_miniEdge*2 + m_miniTitle );

 }
 
 void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
 }
 
 void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )


@@ -483,32 +483,31 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
     }
     else
     {
     }
     else
     {

-        /* no child: go out ! */
-        if (!GetChildren().First()) return;
-
-        /* do we have exactly one child? */
-        wxWindow *child = (wxWindow *) NULL;
-        for(wxNode *node = GetChildren().First(); node; node = node->Next())
+        // do we have exactly one child?
+        wxWindow *child = (wxWindow *)NULL;
+        for ( wxNode *node = GetChildren().First(); node; node = node->Next() )

         {
             wxWindow *win = (wxWindow *)node->Data();
         {
             wxWindow *win = (wxWindow *)node->Data();

-            if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog)
-#if 0  // not in m_children anyway ?
-              && (win != m_frameMenuBar) &&
-              (win != m_frameToolBar) &&
-              (win != m_frameStatusBar)
-#endif
-            )
+            if ( !wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) )

             {
             {

-                /* it's the second one: do nothing */
-                if (child) return;
+                if ( child )
+                {
+                    // it's the second one: do nothing
+                    return;
+                }
+

                 child = win;
             }
         }
 
                 child = win;
             }
         }
 

-        /* yes: set it's size to fill all the frame */
-        int client_x, client_y;
-        GetClientSize( &client_x, &client_y );
-        child->SetSize( 1, 1, client_x-2, client_y-2 );
+        // no children at all?
+        if ( child )
+        {
+            // yes: set it's size to fill all the frame
+            int client_x, client_y;
+            GetClientSize( &client_x, &client_y );
+            child->SetSize( 1, 1, client_x-2, client_y-2 );
+        }

     }
 }
 
     }
 }
 


@@ -548,8 +547,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
             gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
                 m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
 
             gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
                 m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
 

-           /* an mdi child menu bar might be underneath */
-           if (m_mdiMenuBar) m_frameMenuBar->Show( FALSE );
+            /* an mdi child menu bar might be underneath */
+            if (m_mdiMenuBar) m_frameMenuBar->Show( FALSE );

         }
     }
 
         }
     }
 


@@ -565,22 +564,20 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
 {
     if (GetStatusBar())
     {
 {
     if (GetStatusBar())
     {

-        if (event.GetMenuId() == -1)
-       {
-            SetStatusText("");
-       }
-        else
+        // if no help string found, we will clear the status bar text
+        wxString helpString;
+
+        int menuId = event.GetMenuId();
+        if ( menuId != -1 )

         {
             wxMenuBar *menuBar = GetMenuBar();
             if (menuBar)
             {
         {
             wxMenuBar *menuBar = GetMenuBar();
             if (menuBar)
             {

-                int menuId = event.GetMenuId();
-                wxString helpString;

                 helpString = menuBar->GetHelpString(menuId);
                 helpString = menuBar->GetHelpString(menuId);

-                if (helpString != "")
-                    SetStatusText(helpString);

             }
         }
             }
         }

+
+        SetStatusText(helpString);

     }
 }
 
     }
 }