X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f96ac56ad3cc1961e41a6130335d7b89a21a76e4..423a556f53cb2e4caade61d39e0e2105e508eecb:/src/gtk/frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 3098d050c0..9b7aa4a001 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -45,6 +45,7 @@ const int wxPLACE_HOLDER   = 0;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
+extern int g_openDialogs;
 
 //-----------------------------------------------------------------------------
 // data
@@ -85,7 +86,7 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
                                 (int)alloc->width,
                                 (int)alloc->height );
 */
-				
+
         win->m_width = alloc->width;
         win->m_height = alloc->height;
         win->UpdateSize();
@@ -101,7 +102,8 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX
     if (g_isIdle)
         wxapp_install_idle_handler();
 
-    win->Close();
+    if (g_openDialogs == 0)
+        win->Close();
 
     return TRUE;
 }
@@ -164,19 +166,20 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 // "configure_event"
 //-----------------------------------------------------------------------------
 
-static gint 
-#if (GTK_MINOR_VERSON > 0)
+static gint
+#if (GTK_MINOR_VERSION > 0)
 gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrame *win )
 #else
 gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
 #endif
 {
-    if (g_isIdle) 
+    if (g_isIdle)
         wxapp_install_idle_handler();
 
-    if (!win->m_hasVMT) return FALSE;
-
-#if (GTK_MINOR_VERSON > 0)
+    if (!win->m_hasVMT) 
+        return FALSE;
+	
+#if (GTK_MINOR_VERSION > 0)
     int x = 0;
     int y = 0;
     gdk_window_get_root_origin( win->m_widget->window, &x, &y );
@@ -202,11 +205,16 @@ gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *ev
    so we do this directly after realization */
 
 static gint
-gtk_frame_realized_callback( GtkWidget *WXUNUSED(widget), wxFrame *win )
+gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
 
+    /* I haven't been able to set the position of
+       the dialog before it is shown, so I set the
+       position in "realize" */
+    gtk_widget_set_uposition( widget, win->m_x, win->m_y );
+
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
     long decor = (long) GDK_DECOR_BORDER;
@@ -245,18 +253,18 @@ gtk_frame_realized_callback( GtkWidget *WXUNUSED(widget), wxFrame *win )
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
 
     /* set size hints */
-    gint flag =	GDK_HINT_POS;
+    gint flag = 0; // GDK_HINT_POS;
     if ((win->GetMinWidth() != -1) || (win->GetMinHeight() != -1)) flag |= GDK_HINT_MIN_SIZE;
     if ((win->GetMaxWidth() != -1) || (win->GetMaxHeight() != -1)) flag |= GDK_HINT_MAX_SIZE;
     if (flag)
     {
-        gdk_window_set_hints( win->m_widget->window, 
-	                      win->m_x, win->m_y,
-			      win->GetMinWidth(), win->GetMinHeight(),
-			      win->GetMaxWidth(), win->GetMaxHeight(),
-			      flag );
+        gdk_window_set_hints( win->m_widget->window,
+                              win->m_x, win->m_y,
+                              win->GetMinWidth(), win->GetMinHeight(),
+                              win->GetMaxWidth(), win->GetMaxHeight(),
+                              flag );
     }
-    
+
     /* reset the icon */
     if (win->m_icon != wxNullIcon)
     {
@@ -295,12 +303,12 @@ gtk_frame_realized_callback( GtkWidget *WXUNUSED(widget), wxFrame *win )
 static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 {
     wxASSERT( GTK_IS_WIDGET(child->m_widget) );
-    
+
     if (!parent->m_insertInClientArea)
     {
         /* 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,
@@ -327,7 +335,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
     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,
@@ -392,7 +400,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxFrame creation failed") );
-	return FALSE;
+        return FALSE;
     }
 
     m_title = title;
@@ -418,7 +426,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 */
-    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 );
@@ -428,7 +436,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 #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 );
 
@@ -525,6 +533,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 
     int old_x = m_x;
     int old_y = m_y;
+
     int old_width = m_width;
     int old_height = m_height;
 
@@ -641,8 +650,6 @@ void wxFrame::DoSetClientSize( int width, int height )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
-    printf( "set size %d %d\n", width, height );
-
         /* menu bar */
         if (m_frameMenuBar)
         {
@@ -690,7 +697,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
     m_width = width;
     m_height = height;
-    
+
     /* space occupied by m_frameToolBar and m_frameMenuBar */
     int client_area_y_offset = 0;
 
@@ -726,7 +733,7 @@ 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;
-            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;
@@ -734,7 +741,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
 #if wxUSE_TOOLBAR
         if ((m_frameToolBar) &&
-	    (m_frameToolBar->m_widget->parent == m_mainWidget))
+            (m_frameToolBar->m_widget->parent == m_mainWidget))
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
@@ -747,12 +754,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             }
             int ww = m_width - 2*m_miniEdge;
             int hh = m_frameToolBar->m_height;
-	    if (m_toolBarDetached) hh = wxPLACE_HOLDER;
+            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 reported size
                m_frameToolBar->m_width = ww; */
-            gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+            gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
                                   m_frameToolBar->m_widget,
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
@@ -763,7 +770,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;
-        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 );
     }
@@ -784,7 +791,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;
-        gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow),
+        gtk_pizza_set_size( GTK_PIZZA(m_wxwindow),
                               m_frameStatusBar->m_widget,
                               xx, yy, ww, hh );
     }
@@ -795,7 +802,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
 
     m_sizeSet = TRUE;
-    
+
     // send size event to frame
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
@@ -825,11 +832,11 @@ void wxFrame::OnInternalIdle()
     if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
     {
         GtkOnSize( m_x, m_y, m_width, m_height );
-	
-	// we'll come back later
+
+        // we'll come back later
         if (g_isIdle)
             wxapp_install_idle_handler();
-	return;
+        return;
     }
 
     if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
@@ -902,7 +909,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
         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,
@@ -917,8 +924,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
                 gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
                     GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
             }
-	    
-	    m_frameMenuBar->Show( TRUE );
+
+            m_frameMenuBar->Show( TRUE );
         }
     }
 
@@ -940,12 +947,16 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
         wxString helpString;
 
         int menuId = event.GetMenuId();
-        if ( menuId != -1 )
+        if ( menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */ )
         {
             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();
             }
         }
 
@@ -979,9 +990,9 @@ wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString&
     return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
 }
 
-void wxFrame::SetToolBar(wxToolBar *toolbar) 
-{ 
-    m_frameToolBar = toolbar; 
+void wxFrame::SetToolBar(wxToolBar *toolbar)
+{
+    m_frameToolBar = toolbar;
     if (m_frameToolBar)
     {
         /* insert into toolbar area if not already there */
@@ -989,10 +1000,10 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
             (m_frameToolBar->m_widget->parent != m_mainWidget))
         {
             GetChildren().DeleteObject( m_frameToolBar );
-	
-	    gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget );
-	    UpdateSize();
-	}
+
+            gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget );
+            UpdateSize();
+        }
     }
 }
 
@@ -1070,10 +1081,10 @@ void wxFrame::Command( int id )
     wxMenuBar *bar = GetMenuBar();
     if (!bar) return;
 
-    wxMenuItem *item = bar->FindItemForId(id) ;
+    wxMenuItem *item = bar->FindItem(id) ;
     if (item && item->IsCheckable())
     {
-        bar->Check(id,!bar->Checked(id)) ;
+        bar->Check(id, !bar->IsChecked(id)) ;
     }
 
     wxEvtHandler* evtHandler = GetEventHandler();
@@ -1106,25 +1117,25 @@ void wxFrame::SetIcon( const wxIcon &icon )
     gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }
 
-void wxFrame::Maximize(bool WXUNUSED(maximize)) 
+void wxFrame::Maximize(bool WXUNUSED(maximize))
 {
 }
 
-void wxFrame::Restore() 
+void wxFrame::Restore()
 {
 }
 
-void wxFrame::Iconize( bool iconize ) 
-{ 
+void wxFrame::Iconize( bool iconize )
+{
    if (iconize)
    {
         XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ),
-	                GDK_WINDOW_XWINDOW( m_widget->window ),
-			DefaultScreen( GDK_DISPLAY() ) );
+                        GDK_WINDOW_XWINDOW( m_widget->window ),
+                        DefaultScreen( GDK_DISPLAY() ) );
    }
 }
 
-bool wxFrame::IsIconized() const 
-{ 
-    return FALSE; 
+bool wxFrame::IsIconized() const
+{
+    return FALSE;
 }