X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15b24b148ad8ceadc501893ce34df3867f519a41..ea5c6ca7f7c3dc448da4be353a1153a792d01db4:/src/gtk/frame.cpp diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 637c62ff6e..365f857639 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -62,23 +62,17 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (!win->HasVMT()) return; + if (g_isIdle) + wxapp_install_idle_handler(); -/* - printf( "OnFrameResize from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); -*/ + if (!win->m_hasVMT) return; - if ((win->m_width != alloc->width) || (win->m_height != alloc->height)) - { - win->m_sizeSet = FALSE; - win->m_width = alloc->width; - win->m_height = alloc->height; - } + if ((win->m_width != alloc->width) || (win->m_height != alloc->height)) + { + win->m_width = alloc->width; + win->m_height = alloc->height; + win->UpdateSize(); + } } //----------------------------------------------------------------------------- @@ -87,14 +81,8 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - -/* - printf( "OnDelete from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); -*/ + if (g_isIdle) + wxapp_install_idle_handler(); win->Close(); @@ -107,12 +95,10 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (!win->HasVMT()) return; + if (!win->m_hasVMT) return; win->m_menuBarDetached = FALSE; - win->m_sizeSet = FALSE; + win->UpdateSize(); } //----------------------------------------------------------------------------- @@ -121,12 +107,10 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (!win->HasVMT()) return; + if (!win->m_hasVMT) return; win->m_menuBarDetached = TRUE; - win->m_sizeSet = FALSE; + win->UpdateSize(); } //----------------------------------------------------------------------------- @@ -135,12 +119,11 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (!win->HasVMT()) return; + if (!win->m_hasVMT) return; win->m_toolBarDetached = FALSE; - win->m_sizeSet = FALSE; + + win->UpdateSize(); } //----------------------------------------------------------------------------- @@ -151,10 +134,10 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return; + if (!win->m_hasVMT) return; win->m_toolBarDetached = TRUE; - win->m_sizeSet = FALSE; + win->UpdateSize(); } //----------------------------------------------------------------------------- @@ -163,9 +146,10 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); - if (!win->HasVMT()) return FALSE; + if (!win->m_hasVMT) return FALSE; win->m_x = event->x; win->m_y = event->y; @@ -187,35 +171,43 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC static gint gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); /* 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_ALL; - long func = (long) GDK_FUNC_ALL; + long decor = (long) GDK_DECOR_BORDER; + long func = (long) GDK_FUNC_MOVE; - if ((win->m_windowStyle & wxCAPTION) == 0) - decor |= GDK_DECOR_TITLE; - if ((win->m_windowStyle & wxSYSTEM_MENU) == 0) - decor |= GDK_DECOR_MENU; - if ((win->m_windowStyle & wxMINIMIZE_BOX) == 0) + if ((win->GetWindowStyle() & wxCAPTION) != 0) + decor |= GDK_DECOR_TITLE; + if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0) + { + decor |= GDK_DECOR_MENU; + func |= GDK_FUNC_CLOSE; + } + if ((win->GetWindowStyle() & wxMINIMIZE_BOX) != 0) { - func |= GDK_FUNC_MINIMIZE; - decor |= GDK_DECOR_MINIMIZE; + func |= GDK_FUNC_MINIMIZE; + decor |= GDK_DECOR_MINIMIZE; } - if ((win->m_windowStyle & wxMAXIMIZE_BOX) == 0) + if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0) { - func |= GDK_FUNC_MAXIMIZE; - decor |= GDK_DECOR_MAXIMIZE; + func |= GDK_FUNC_MAXIMIZE; + decor |= GDK_DECOR_MAXIMIZE; } - if ((win->m_windowStyle & wxRESIZE_BORDER) == 0) - func |= GDK_FUNC_RESIZE; - + if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0) + { + func |= GDK_FUNC_RESIZE; + decor |= GDK_DECOR_RESIZEH; + } + + gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor); gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func); /* GTK's shrinking/growing policy */ - if ((win->m_windowStyle & wxRESIZE_BORDER) == 0) + if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0) gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1); else gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1); @@ -225,22 +217,22 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) { wxIcon icon( win->m_icon ); win->m_icon = wxNullIcon; - win->SetIcon( icon ); + win->SetIcon( icon ); } /* we set the focus to the child that accepts the focus. this doesn't really have to be done in "realize" but why not? */ - wxNode *node = win->m_children.First(); + wxWindowList::Node *node = win->GetChildren().GetFirst(); while (node) { - wxWindow *child = (wxWindow*) node->Data(); - if (child->AcceptsFocus()) - { - child->SetFocus(); - break; - } - - node = node->Next(); + wxWindow *child = node->GetData(); + if (child->AcceptsFocus()) + { + child->SetFocus(); + break; + } + + node = node->GetNext(); } return FALSE; @@ -260,29 +252,31 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child ) if (wxIS_KIND_OF(child,wxToolBar) || wxIS_KIND_OF(child,wxMenuBar)) { /* actually, menubars are never inserted here, but this - may change one day */ + may change one day */ /* these are outside the client area */ - wxFrame* frame = (wxFrame*) parent; + wxFrame* frame = (wxFrame*) parent; gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget), GTK_WIDGET(child->m_widget), child->m_x, - child->m_y ); - - /* we connect to these events for recalculating the client area - space when the toolbar is floating */ - if (wxIS_KIND_OF(child,wxToolBar)) - { - wxToolBar *toolBar = (wxToolBar*) child; - if (toolBar->m_windowStyle & wxTB_DOCKABLE) - { + child->m_y, + child->m_width, + child->m_height ); + + /* we connect to these events for recalculating the client area + space when the toolbar is floating */ + if (wxIS_KIND_OF(child,wxToolBar)) + { + wxToolBar *toolBar = (wxToolBar*) child; + if (toolBar->GetWindowStyle() & wxTB_DOCKABLE) + { gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_attached", GTK_SIGNAL_FUNC(gtk_toolbar_attached_callback), (gpointer)parent ); - + gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_detached", GTK_SIGNAL_FUNC(gtk_toolbar_detached_callback), (gpointer)parent ); - } - } + } + } } else { @@ -290,15 +284,13 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child ) gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow), GTK_WIDGET(child->m_widget), child->m_x, - child->m_y ); + child->m_y, + child->m_width, + child->m_height ); } - gtk_widget_set_usize( GTK_WIDGET(child->m_widget), - child->m_width, - child->m_height ); - /* resize on OnInternalIdle */ - parent->m_sizeSet = FALSE; + parent->UpdateSize(); } //----------------------------------------------------------------------------- @@ -362,6 +354,9 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP; m_widget = gtk_window_new( win_type ); + + if (!name.IsEmpty()) + gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() ); #ifdef __WXDEBUG__ debug_focus_in( m_widget, _T("wxFrame::m_widget"), name ); @@ -403,7 +398,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, /* we cannot set MWM hints and icons before the widget has been realized, so we do this directly after realization */ gtk_signal_connect( GTK_OBJECT(m_widget), "realize", - GTK_SIGNAL_FUNC(gtk_frame_realized_callback), (gpointer) this ); + GTK_SIGNAL_FUNC(gtk_frame_realized_callback), (gpointer) this ); /* the user resized the frame by dragging etc. */ gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", @@ -418,6 +413,8 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, wxFrame::~wxFrame() { + m_isBeingDeleted = TRUE; + if (m_frameMenuBar) delete m_frameMenuBar; m_frameMenuBar = (wxMenuBar *) NULL; @@ -513,15 +510,15 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) if ((m_x != old_x) || (m_y != old_y)) { /* we set the size here and in gtk_frame_map_callback */ - 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)) { /* we set the size in GtkOnSize, i.e. mostly the actual resizing is - done either directly before the frame is shown or in idle time - so that different calls to SetSize() don't lead to flicker. */ + done either directly before the frame is shown or in idle time + so that different calls to SetSize() don't lead to flicker. */ m_sizeSet = FALSE; } @@ -541,39 +538,39 @@ void wxFrame::Centre( int direction ) Move( x, y ); } -void wxFrame::GetClientSize( int *width, int *height ) const +void wxFrame::DoGetClientSize( int *width, int *height ) const { wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - wxWindow::GetClientSize( width, height ); + wxWindow::DoGetClientSize( width, height ); if (height) { /* menu bar */ if (m_frameMenuBar) - { - if (!m_menuBarDetached) - (*height) -= wxMENU_HEIGHT; - else - (*height) -= wxPLACE_HOLDER; - } - - /* status bar */ + { + if (!m_menuBarDetached) + (*height) -= wxMENU_HEIGHT; + else + (*height) -= wxPLACE_HOLDER; + } + + /* status bar */ if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; - - /* tool bar */ + + /* tool bar */ if (m_frameToolBar) { - if (!m_toolBarDetached) - { + if (!m_toolBarDetached) + { int y = 0; m_frameToolBar->GetSize( (int *) NULL, &y ); (*height) -= y; - } - else + } + else (*height) -= wxPLACE_HOLDER; } - - /* mini edge */ + + /* mini edge */ (*height) -= m_miniEdge*2 + m_miniTitle; } if (width) @@ -588,29 +585,29 @@ void wxFrame::DoSetClientSize( int width, int height ) /* menu bar */ if (m_frameMenuBar) - { - if (!m_menuBarDetached) - height += wxMENU_HEIGHT; - else - height += wxPLACE_HOLDER; - } - - /* status bar */ + { + if (!m_menuBarDetached) + height += wxMENU_HEIGHT; + else + height += wxPLACE_HOLDER; + } + + /* status bar */ if (m_frameStatusBar) height += wxSTATUS_HEIGHT; - - /* tool bar */ + + /* tool bar */ if (m_frameToolBar) { - if (!m_toolBarDetached) - { + if (!m_toolBarDetached) + { int y = 0; m_frameToolBar->GetSize( (int *) NULL, &y ); height += y; - } - else + } + else height += wxPLACE_HOLDER; } - + wxWindow::DoSetClientSize( width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle ); } @@ -660,16 +657,15 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height int yy = m_miniEdge + m_miniTitle; int ww = m_width - 2*m_miniEdge; int hh = wxMENU_HEIGHT; - if (m_menuBarDetached) hh = wxPLACE_HOLDER; + if (m_menuBarDetached) hh = wxPLACE_HOLDER; m_frameMenuBar->m_x = xx; m_frameMenuBar->m_y = yy; m_frameMenuBar->m_width = ww; m_frameMenuBar->m_height = hh; - - gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameMenuBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh ); - - client_area_y_offset += hh; + gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), + m_frameMenuBar->m_widget, + xx, yy, ww, hh ); + client_area_y_offset += hh; } if (m_frameToolBar) @@ -677,12 +673,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height int xx = m_miniEdge; int yy = m_miniEdge + m_miniTitle; if (m_frameMenuBar) - { - if (!m_menuBarDetached) - yy += wxMENU_HEIGHT; - else - yy += wxPLACE_HOLDER; - } + { + if (!m_menuBarDetached) + yy += wxMENU_HEIGHT; + else + yy += wxPLACE_HOLDER; + } int ww = m_width - 2*m_miniEdge; int hh = m_frameToolBar->m_height; if (m_toolBarDetached) hh = wxPLACE_HOLDER; @@ -690,25 +686,24 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height m_frameToolBar->m_y = yy; /* m_frameToolBar->m_height = hh; don't change the toolbar's height */ m_frameToolBar->m_width = ww; - - gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameToolBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh ); - - client_area_y_offset += hh; + gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), + m_frameToolBar->m_widget, + xx, yy, ww, hh ); + client_area_y_offset += hh; } int client_x = m_miniEdge; - int client_y = client_area_y_offset + m_miniEdge + m_miniTitle; - gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_wxwindow, client_x, client_y ); - + 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_widget_set_usize( m_wxwindow, client_w, client_h ); + int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle; + gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), + m_wxwindow, + client_x, client_y, client_w, client_h ); } else { /* if there is no m_mainWidget between m_widget and m_wxwindow there - is no need to set the size or position of m_wxwindow. */ + is no need to set the size or position of m_wxwindow. */ } if (m_frameStatusBar) @@ -717,19 +712,18 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset; int ww = m_width - 2*m_miniEdge; int hh = wxSTATUS_HEIGHT; - m_frameStatusBar->m_x = xx; m_frameStatusBar->m_y = yy; m_frameStatusBar->m_width = ww; m_frameStatusBar->m_height = hh; - - gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh ); + gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow), + m_frameStatusBar->m_widget, + xx, yy, 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 */ @@ -840,20 +834,24 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) node = node->Next(); } - if (m_frameMenuBar->m_parent != this) + if (m_frameMenuBar->GetParent() != this) { - m_frameMenuBar->m_parent = this; + m_frameMenuBar->SetParent(this); gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), - m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); - - if (menuBar->m_windowStyle & wxMB_DOCKABLE) - { + m_frameMenuBar->m_widget, + m_frameMenuBar->m_x, + m_frameMenuBar->m_y, + m_frameMenuBar->m_width, + m_frameMenuBar->m_height ); + + if (menuBar->GetWindowStyle() & wxMB_DOCKABLE) + { gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached", GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this ); - + gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached", GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this ); - } + } } }