wxUSE_RADIOBOX/SLIDER/SPINCTRL added

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 6ecd18ed733eb3584d747ef45e1c5694c48250d8..0f1306462d64b74c7b119fd96f52ff0525ff08a2 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -85,6 +85,7 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
                                 (int)alloc->width,
                                 (int)alloc->height );
 */
                                 (int)alloc->width,
                                 (int)alloc->height );
 */

+                               

         win->m_width = alloc->width;
         win->m_height = alloc->height;
         win->UpdateSize();
         win->m_width = alloc->width;
         win->m_height = alloc->height;
         win->UpdateSize();


@@ -299,7 +300,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
     {
         /* these are outside the client area */
         wxFrame* frame = (wxFrame*) parent;
     {
         /* these are outside the client area */
         wxFrame* frame = (wxFrame*) parent;

-        gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
+        gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget),

                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y,
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y,


@@ -326,7 +327,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
     else
     {
         /* these are inside the client area */
     else
     {
         /* these are inside the client area */

-        gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
+        gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),

                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y,
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y,


@@ -417,7 +418,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
         GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
 
     /* m_mainWidget holds the toolbar, the menubar and the client area */
         GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
 
     /* m_mainWidget holds the toolbar, the menubar and the client area */

-    m_mainWidget = gtk_myfixed_new();
+    m_mainWidget = gtk_pizza_new();

     gtk_widget_show( m_mainWidget );
     GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
     gtk_widget_show( m_mainWidget );
     GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );


@@ -427,7 +428,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 #endif
 
     /* m_wxwindow only represents the client area without toolbar and menubar */
 #endif
 
     /* m_wxwindow only represents the client area without toolbar and menubar */

-    m_wxwindow = gtk_myfixed_new();
+    m_wxwindow = gtk_pizza_new();

     gtk_widget_show( m_wxwindow );
     gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
 
     gtk_widget_show( m_wxwindow );
     gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
 


@@ -542,6 +543,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
         m_height = height;
     }
 
         m_height = height;
     }
 

+/*

     if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
     {
         if (width == -1) m_width = 80;
     if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
     {
         if (width == -1) m_width = 80;


@@ -551,6 +553,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     {
        if (height == -1) m_height = 26;
     }
     {
        if (height == -1) m_height = 26;
     }

+*/

 
     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_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;


@@ -638,6 +641,8 @@ void wxFrame::DoSetClientSize( int width, int height )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 

+    printf( "set size %d %d\n", width, height );
+

         /* menu bar */
         if (m_frameMenuBar)
         {
         /* menu bar */
         if (m_frameMenuBar)
         {


@@ -667,7 +672,7 @@ void wxFrame::DoSetClientSize( int width, int height )
         }
 #endif
 
         }
 #endif
 

-    wxWindow::DoSetClientSize( width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle );
+    DoSetSize( -1, -1, width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle, 0 );

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


@@ -685,7 +690,7 @@ 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;

-
+    

     /* space occupied by m_frameToolBar and m_frameMenuBar */
     int client_area_y_offset = 0;
 
     /* space occupied by m_frameToolBar and m_frameMenuBar */
     int client_area_y_offset = 0;
 


@@ -721,14 +726,15 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             m_frameMenuBar->m_y = yy;
             m_frameMenuBar->m_width = ww;
             m_frameMenuBar->m_height = hh;
             m_frameMenuBar->m_y = yy;
             m_frameMenuBar->m_width = ww;
             m_frameMenuBar->m_height = hh;

-            gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+            gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),

                                   m_frameMenuBar->m_widget,
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }
 
 #if wxUSE_TOOLBAR
                                   m_frameMenuBar->m_widget,
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }
 
 #if wxUSE_TOOLBAR

-        if (m_frameToolBar)
+        if ((m_frameToolBar) &&
+           (m_frameToolBar->m_widget->parent == m_mainWidget))

         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;


@@ -744,9 +750,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
            if (m_toolBarDetached) hh = wxPLACE_HOLDER;
             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;
            if (m_toolBarDetached) hh = wxPLACE_HOLDER;
             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;

-            /* m_frameToolBar->m_height = hh;   don't change the toolbar's height */
-            m_frameToolBar->m_width = ww;
-            gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+            /* m_frameToolBar->m_height = hh;   don't change the toolbar's reported size
+               m_frameToolBar->m_width = ww; */
+            gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),

                                   m_frameToolBar->m_widget,
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
                                   m_frameToolBar->m_widget,
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;


@@ -757,7 +763,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
         int client_w = m_width - 2*m_miniEdge;
         int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
         int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
         int client_w = m_width - 2*m_miniEdge;
         int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;

-        gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+        gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),

                               m_wxwindow,
                               client_x, client_y, client_w, client_h );
     }
                               m_wxwindow,
                               client_x, client_y, client_w, client_h );
     }


@@ -778,7 +784,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         m_frameStatusBar->m_y = yy;
         m_frameStatusBar->m_width = ww;
         m_frameStatusBar->m_height = hh;
         m_frameStatusBar->m_y = yy;
         m_frameStatusBar->m_width = ww;
         m_frameStatusBar->m_height = hh;

-        gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow),
+        gtk_pizza_set_size( GTK_PIZZA(m_wxwindow),

                               m_frameStatusBar->m_widget,
                               xx, yy, ww, hh );
     }
                               m_frameStatusBar->m_widget,
                               xx, yy, ww, hh );
     }


@@ -795,7 +801,6 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 

-/*

     // send size event to status bar
     if (m_frameStatusBar)
     {
     // send size event to status bar
     if (m_frameStatusBar)
     {


@@ -803,7 +808,6 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         event2.SetEventObject( m_frameStatusBar );
         m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 );
     }
         event2.SetEventObject( m_frameStatusBar );
         m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 );
     }

-*/

 
     m_resizing = FALSE;
 }
 
     m_resizing = FALSE;
 }


@@ -898,7 +902,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
         if (m_frameMenuBar->GetParent() != this)
         {
             m_frameMenuBar->SetParent(this);
         if (m_frameMenuBar->GetParent() != this)
         {
             m_frameMenuBar->SetParent(this);

-            gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
+            gtk_pizza_put( GTK_PIZZA(m_mainWidget),

                 m_frameMenuBar->m_widget,
                 m_frameMenuBar->m_x,
                 m_frameMenuBar->m_y,
                 m_frameMenuBar->m_widget,
                 m_frameMenuBar->m_x,
                 m_frameMenuBar->m_y,


@@ -936,12 +940,16 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
         wxString helpString;
 
         int menuId = event.GetMenuId();
         wxString helpString;
 
         int menuId = event.GetMenuId();

-        if ( menuId != -1 )
+        if ( menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */ )

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

-            if (menuBar)
+            if ( menuBar )

             {
             {

-                helpString = menuBar->GetHelpString(menuId);
+                // it's ok if we don't find the item because it might belong to
+                // the popup menu
+                wxMenuItem *item = menuBar->FindItem(menuId);
+                if ( item )
+                    helpString = item->GetHelp();

             }
         }
 
             }
         }
 


@@ -981,16 +989,13 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
     if (m_frameToolBar)
     {
         /* insert into toolbar area if not already there */
     if (m_frameToolBar)
     {
         /* insert into toolbar area if not already there */

-        if (m_frameToolBar->m_widget->parent != m_mainWidget)
+        if ((m_frameToolBar->m_widget->parent) &&
+            (m_frameToolBar->m_widget->parent != m_mainWidget))

         {
         {

-           gtk_widget_ref( m_frameToolBar->m_widget );
-           gtk_widget_unparent( m_frameToolBar->m_widget );
-           
-            m_insertInClientArea = TRUE;
-           wxInsertChildInFrame( this, m_frameToolBar );
-            m_insertInClientArea = FALSE;
-           
-           gtk_widget_unref( m_frameToolBar->m_widget );
+            GetChildren().DeleteObject( m_frameToolBar );
+       
+           gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget );
+           UpdateSize();

        }
     }
 }
        }
     }
 }


@@ -1069,10 +1074,10 @@ void wxFrame::Command( int id )
     wxMenuBar *bar = GetMenuBar();
     if (!bar) return;
 
     wxMenuBar *bar = GetMenuBar();
     if (!bar) return;
 

-    wxMenuItem *item = bar->FindItemForId(id) ;
+    wxMenuItem *item = bar->FindItem(id) ;

     if (item && item->IsCheckable())
     {
     if (item && item->IsCheckable())
     {

-        bar->Check(id,!bar->Checked(id)) ;
+        bar->Check(id, !bar->IsChecked(id)) ;

     }
 
     wxEvtHandler* evtHandler = GetEventHandler();
     }
 
     wxEvtHandler* evtHandler = GetEventHandler();