SetLabel() adjusts the label size

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

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index b96f0a96b25653e79d5763b34cdd4e20bfbd7bee..84899e1e489099cdb61e61836efd7e70704a18bf 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -8,7 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "frame.h"
+    #pragma implementation "frame.h"

 #endif
 
 #include "wx/frame.h"
 #endif
 
 #include "wx/frame.h"


@@ -36,7 +36,6 @@ const int wxSTATUS_HEIGHT  = 25;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern wxList wxTopLevelWindows;

 extern wxList wxPendingDelete;
 
 //-----------------------------------------------------------------------------
 extern wxList wxPendingDelete;
 
 //-----------------------------------------------------------------------------


@@ -104,6 +103,7 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
     EVT_SIZE(wxFrame::OnSize)
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
     EVT_SIZE(wxFrame::OnSize)

+    EVT_CLOSE(wxFrame::OnCloseWindow)

     EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
 END_EVENT_TABLE()
 
     EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
 END_EVENT_TABLE()
 


@@ -112,6 +112,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
 wxFrame::wxFrame()
 {
     m_frameMenuBar = (wxMenuBar *) NULL;
 wxFrame::wxFrame()
 {
     m_frameMenuBar = (wxMenuBar *) NULL;

+    m_mdiMenuBar = (wxMenuBar *) NULL;

     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;


@@ -124,6 +125,7 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
       long style, const wxString &name )
 {
     m_frameMenuBar = (wxMenuBar *) NULL;
       long style, const wxString &name )
 {
     m_frameMenuBar = (wxMenuBar *) NULL;

+    m_mdiMenuBar = (wxMenuBar *) NULL;

     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;


@@ -149,19 +151,10 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
     m_widget = gtk_window_new( win_type );
 
 
     m_widget = gtk_window_new( win_type );
 

-#ifdef __WXDEBUG__
-        debug_focus_in( m_widget, "wxFrame::m_widget", name );
-#endif
-
-    if ((size.x != -1) && (size.y != -1))
-        gtk_widget_set_usize( m_widget, m_width, m_height );
-    if ((pos.x != -1) && (pos.y != -1))
-        gtk_widget_set_uposition( m_widget, m_x, m_y );
-

     gtk_window_set_title( GTK_WINDOW(m_widget), title );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 
     gtk_window_set_title( GTK_WINDOW(m_widget), title );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 

-    gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL );
+    gtk_window_set_policy( GTK_WINDOW(m_widget), 1, 1, 0 );

 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );


@@ -170,30 +163,33 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 

-#ifdef __WXDEBUG__
-        debug_focus_in( m_wxwindow, "wxFrame::m_wxwindow", name );
-#endif
-

     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
 
     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
 

+    if (m_parent) m_parent->AddChild( this );
+
+    PostCreation();
+
+    gtk_widget_realize( m_widget );
+    

     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
         GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
         GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
 

-    if (m_parent) m_parent->AddChild( this );
-
-    PostCreation();
-

     return TRUE;
 }
 
 wxFrame::~wxFrame()
 {
     if (m_frameMenuBar) delete m_frameMenuBar;
     return TRUE;
 }
 
 wxFrame::~wxFrame()
 {
     if (m_frameMenuBar) delete m_frameMenuBar;

+    m_frameMenuBar = (wxMenuBar *) NULL;
+    

     if (m_frameStatusBar) delete m_frameStatusBar;
     if (m_frameStatusBar) delete m_frameStatusBar;

+    m_frameStatusBar = (wxStatusBar *) NULL;
+    

     if (m_frameToolBar) delete m_frameToolBar;
     if (m_frameToolBar) delete m_frameToolBar;

+    m_frameToolBar = (wxToolBar *) NULL;

 
     wxTopLevelWindows.DeleteObject( this );
 
 
     wxTopLevelWindows.DeleteObject( this );
 


@@ -214,10 +210,10 @@ bool wxFrame::Show( bool show )
 
     if (show && !m_sizeSet)
     {
 
     if (show && !m_sizeSet)
     {

-  // by calling GtkOnSize here, we don't have to call
-  // either after showing the frame, which would entail
-  // much ugly flicker nor from within the size_allocate
-  // handler, because GTK 1.1.X forbids that.
+        /* by calling GtkOnSize here, we don't have to call
+           either after showing the frame, which would entail
+           much ugly flicker nor from within the size_allocate
+           handler, because GTK 1.1.X forbids that. */

 
         GtkOnSize( m_x, m_y, m_width, m_height );
     }
 
         GtkOnSize( m_x, m_y, m_width, m_height );
     }


@@ -252,11 +248,11 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

-void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
+void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )

 {
 {

-    wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );

 
 

-    // Don't do anything for children of wxMDIChildFrame
+    /* don't do anything for children of wxMDIChildFrame */

     if (!m_wxwindow) return;
 
     if (m_resizing) return; // I don't like recursions
     if (!m_wxwindow) return;
 
     if (m_resizing) return; // I don't like recursions


@@ -300,26 +296,21 @@ void wxFrame::SetSize( 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; */

             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))
     {

-       gtk_widget_set_usize( m_widget, m_width, m_height );
+        /* we set the size in GtkOnSize */
+        m_sizeSet = FALSE;

     }
 
     }
 

-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-

     m_resizing = FALSE;
 }
 
     m_resizing = FALSE;
 }
 

-void wxFrame::SetSize( int width, int height )
-{
-    SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
-}
-

 void wxFrame::Centre( int direction )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 void wxFrame::Centre( int direction )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );


@@ -327,8 +318,8 @@ void wxFrame::Centre( int direction )
     int x = 0;
     int y = 0;
 
     int x = 0;
     int y = 0;
 

-    if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
-    if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
+    if ((direction & wxHORIZONTAL) == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
+    if ((direction & wxVERTICAL) == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;

 
     Move( x, y );
 }
 
     Move( x, y );
 }


@@ -356,7 +347,7 @@ void wxFrame::GetClientSize( int *width, int *height ) const
     }
 }
 
     }
 }
 

-void wxFrame::SetClientSize( int const width, int const height )
+void wxFrame::DoSetClientSize( int width, int height )

 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 


@@ -369,7 +360,7 @@ void wxFrame::SetClientSize( int const width, int const 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 )


@@ -386,17 +377,16 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     m_width = width;
     m_height = height;
 
     m_width = width;
     m_height = height;
 

+    /* check if size is in legal range */

     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
     if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
     if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
 
     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
     if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
     if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
 

-    gtk_widget_set_usize( m_widget, m_width, m_height );
-
-    // this emulates the new wxMSW behaviour of placing all
-    // frame-subwindows (menu, toolbar..) on one native window
-        // OK, this hurts in the eye, but I don't want to call SetSize()
-        // because I don't want to call any non-native functions here.
+    /* this emulates the new wxMSW behaviour of placing all
+     * frame-subwindows (menu, toolbar..) on one native window
+     * this hurts in the eye, but I don't want to call SetSize()
+     * because I don't want to call any non-native functions here. */

 
     if (m_frameMenuBar)
     {
 
     if (m_frameMenuBar)
     {


@@ -412,12 +402,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, xx, yy );
         gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
     }
         gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, xx, yy );
         gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
     }

-
+    

     if (m_frameToolBar)
     {
         int xx = m_miniEdge;
         int yy = m_miniEdge + m_miniTitle;
     if (m_frameToolBar)
     {
         int xx = m_miniEdge;
         int yy = m_miniEdge + m_miniTitle;

-        if (m_frameMenuBar) yy += wxMENU_HEIGHT;
+        if ((m_frameMenuBar) || (m_mdiMenuBar)) yy += wxMENU_HEIGHT;

         int ww = m_width - 2*m_miniEdge;
         int hh = m_frameToolBar->m_height;
 
         int ww = m_width - 2*m_miniEdge;
         int hh = m_frameToolBar->m_height;
 


@@ -446,16 +436,17 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
     }
 
         gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
     }
 

+    /* we actually set the size of a frame here and no-where else */
+    gtk_widget_set_usize( m_widget, m_width, m_height );
+

     m_sizeSet = TRUE;
 
     /* send size event to frame */
     m_sizeSet = TRUE;
 
     /* send size event to frame */

-

     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 
     /* send size event to status bar */
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 
     /* send size event to status bar */

-

     if (m_frameStatusBar)
     {
         wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );
     if (m_frameStatusBar)
     {
         wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );


@@ -474,6 +465,13 @@ void wxFrame::OnInternalIdle()
     DoMenuUpdates();
 }
 
     DoMenuUpdates();
 }
 

+void wxFrame::OnCloseWindow( wxCloseEvent& event )
+{
+    // close the window if it wasn't vetoed by the application
+//    if ( !event.GetVeto() ) // No, this isn't the interpretation of GetVeto.
+    Destroy();
+}
+

 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );


@@ -484,39 +482,38 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
     }
     else
     {
     }
     else
     {

-        // no child: go out !
-        if (!GetChildren().First()) return;
-

         // do we have exactly one child?
         // do we have exactly one child?

-        wxWindow *child = (wxWindow *) NULL;
-        for(wxNode *node = GetChildren().First(); node; node = node->Next())
+        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 );
+        }

     }
 }
 
 static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
     menu->SetInvokingWindow( win );
     }
 }
 
 static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
     menu->SetInvokingWindow( win );

-    wxNode *node = menu->m_items.First();
+    wxNode *node = menu->GetItems().First();

     while (node)
     {
         wxMenuItem *menuitem = (wxMenuItem*)node->Data();
     while (node)
     {
         wxMenuItem *menuitem = (wxMenuItem*)node->Data();


@@ -535,7 +532,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 
     if (m_frameMenuBar)
     {
 
     if (m_frameMenuBar)
     {

-        wxNode *node = m_frameMenuBar->m_menus.First();
+        wxNode *node = m_frameMenuBar->GetMenus().First();

         while (node)
         {
             wxMenu *menu = (wxMenu*)node->Data();
         while (node)
         {
             wxMenu *menu = (wxMenu*)node->Data();


@@ -548,6 +545,10 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
             m_frameMenuBar->m_parent = this;
             gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
                 m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
             m_frameMenuBar->m_parent = this;
             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 );

         }
     }
 
         }
     }
 


@@ -563,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);

     }
 }
 
     }
 }
 


@@ -641,6 +640,23 @@ wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id,
     return statusBar;
 }
 
     return statusBar;
 }
 

+void wxFrame::Command( int id )
+{
+    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+    commandEvent.SetInt( id );
+    commandEvent.SetEventObject( this );
+
+    wxMenuBar *bar = GetMenuBar();
+    if (!bar) return;
+
+    wxMenuItem *item = bar->FindItemForId(id) ;
+    if (item && item->IsCheckable())
+    {
+        bar->Check(id,!bar->Checked(id)) ;
+    }
+    GetEventHandler()->ProcessEvent(commandEvent);
+}
+

 void wxFrame::SetStatusText(const wxString& text, int number)
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );