// data
//-----------------------------------------------------------------------------
-extern wxList wxTopLevelWindows;
extern wxList wxPendingDelete;
//-----------------------------------------------------------------------------
return FALSE;
}
+//-----------------------------------------------------------------------------
+// InsertChild for wxFrame
+//-----------------------------------------------------------------------------
+
+/* Callback for wxFrame. This very strange beast has to be used because
+ * C++ has no virtual methods in a constructor. We have to emulate a
+ * virtual function here as wxWindows requires different ways to insert
+ * a child in container classes. */
+
+static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
+{
+ if (wxIS_KIND_OF(child,wxToolBar) || wxIS_KIND_OF(child,wxMenuBar))
+ {
+ /* these are outside the client area */
+ wxFrame* frame = (wxFrame*) parent;
+ gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
+ GTK_WIDGET(child->m_widget),
+ child->m_x,
+ child->m_y );
+ }
+ else
+ {
+ /* these are inside the client area */
+ gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
+ GTK_WIDGET(child->m_widget),
+ child->m_x,
+ child->m_y );
+ }
+
+ gtk_widget_set_usize( GTK_WIDGET(child->m_widget),
+ child->m_width,
+ child->m_height );
+
+ /* resize on OnInternalIdle */
+ parent->m_sizeSet = FALSE;
+
+ if (parent->m_windowStyle & wxTAB_TRAVERSAL)
+ {
+ /* we now allow a window to get the focus as long as it
+ doesn't have any children. */
+ GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS );
+ }
+}
+
//-----------------------------------------------------------------------------
// wxFrame
//-----------------------------------------------------------------------------
m_sizeSet = FALSE;
m_miniEdge = 0;
m_miniTitle = 0;
+ m_mainWidget = (GtkWidget*) NULL;
}
wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
m_sizeSet = FALSE;
m_miniEdge = 0;
m_miniTitle = 0;
+ m_mainWidget = (GtkWidget*) NULL;
Create( parent, id, title, pos, size, style, name );
}
PreCreation( parent, id, pos, size, style, name );
m_title = title;
+
+ m_insertCallback = wxInsertChildInFrame;
GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
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_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL );
+ /* needed ? */
+ 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 );
+ /* m_mainWidget holds the toolbar, the menubar and the client area */
+ m_mainWidget = gtk_myfixed_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_realize( m_mainWidget );
+
+ /* m_wxwindow only represents the client area without toolbar and menubar */
m_wxwindow = gtk_myfixed_new();
gtk_widget_show( m_wxwindow );
GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+ gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
-#ifdef __WXDEBUG__
- debug_focus_in( m_wxwindow, "wxFrame::m_wxwindow", name );
-#endif
+ if (m_parent) m_parent->AddChild( this );
- gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
+ PostCreation();
+ gtk_widget_realize( m_widget );
+
+ /* 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;
+ if ((m_windowStyle & wxCAPTION) == 0)
+ decor |= GDK_DECOR_TITLE;
+/*
+ if ((m_windowStyle & wxMINIMIZE) == 0)
+ func |= GDK_FUNC_MINIMIZE;
+ if ((m_windowStyle & wxMAXIMIZE) == 0)
+ func |= GDK_FUNC_MAXIMIZE;
+*/
+ if ((m_windowStyle & wxSYSTEM_MENU) == 0)
+ decor |= GDK_DECOR_MENU;
+ if ((m_windowStyle & wxMINIMIZE_BOX) == 0)
+ decor |= GDK_DECOR_MINIMIZE;
+ if ((m_windowStyle & wxMAXIMIZE_BOX) == 0)
+ decor |= GDK_DECOR_MAXIMIZE;
+ if ((m_windowStyle & wxRESIZE_BORDER) == 0)
+ func |= GDK_FUNC_RESIZE;
+ gdk_window_set_decorations(m_widget->window, (GdkWMDecoration)decor);
+ gdk_window_set_functions(m_widget->window, (GdkWMFunction)func);
+
+ /* the user resized the frame by dragging etc. */
gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
+ /* the only way to get the window size is to connect to this event */
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;
}
{
/* 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
+ much ugly flicker or from within the size_allocate
handler, because GTK 1.1.X forbids that. */
GtkOnSize( m_x, m_y, m_width, m_height );
return TRUE;
}
-wxPoint wxFrame::GetClientAreaOrigin() const
+void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
- wxPoint pt( m_miniEdge, m_miniEdge + m_miniTitle );
- if (m_frameMenuBar)
- {
- int h = 0;
- m_frameMenuBar->GetSize( (int*)NULL, &h );
- pt.y += h;
- }
- if (m_frameToolBar)
- {
- int h = 0;
- m_frameToolBar->GetSize( (int*)NULL, &h );
- pt.y += h;
- }
- return pt;
-}
-
-void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
-{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- /* Don't do anything for children of wxMDIChildFrame */
- if (!m_wxwindow) return;
+ wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
- if (m_resizing) return; // I don't like recursions
+ /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+ wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+
+ /* avoid recursions */
+ if (m_resizing) return;
m_resizing = TRUE;
int old_x = m_x;
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 );
+ }
}
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, 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. */
+ m_sizeSet = FALSE;
}
- wxSizeEvent event( wxSize(m_width,m_height), GetId() );
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
-
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" );
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 );
}
}
}
-void wxFrame::SetClientSize( int const width, int const height )
+void wxFrame::DoSetClientSize( int width, int height )
{
wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
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 )
// m_x = x;
// m_y = y;
+ /* avoid recursions */
if (m_resizing) return;
m_resizing = TRUE;
- if (!m_wxwindow) return;
-
+ /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+ wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+
m_width = width;
m_height = height;
- 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.
-
- if (m_frameMenuBar)
+ /* space occupied by m_frameToolBar and m_frameMenuBar */
+ int client_area_y_offset = 0;
+
+ /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
+ wxWindow::Create to create it's GTK equivalent. m_mainWidget is only
+ set in wxFrame::Create so it is used to check what kind of frame we
+ have here. if m_mainWidget is NULL it is a wxMDIChildFrame and so we
+ skip the part which handles m_frameMenuBar, m_frameToolBar and (most
+ importantly) m_mainWidget */
+
+ if (m_mainWidget)
{
- int xx = m_miniEdge;
- int yy = m_miniEdge + m_miniTitle;
- int ww = m_width - 2*m_miniEdge;
- int hh = wxMENU_HEIGHT;
- 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_wxwindow), m_frameMenuBar->m_widget, xx, yy );
- gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
- }
+ /* 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;
+
+ /* I revert back to wxGTK's original behaviour. m_mainWidget holds the
+ * menubar, the toolbar and the client area, which is represented by
+ * m_wxwindow.
+ * 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)
+ {
+ int xx = m_miniEdge;
+ int yy = m_miniEdge + m_miniTitle;
+ int ww = m_width - 2*m_miniEdge;
+ int hh = wxMENU_HEIGHT;
+ 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;
+ }
- if (m_frameToolBar)
- {
- int xx = m_miniEdge;
- int yy = m_miniEdge + m_miniTitle;
- if ((m_frameMenuBar) || (m_mdiMenuBar)) yy += wxMENU_HEIGHT;
- int ww = m_width - 2*m_miniEdge;
- int hh = m_frameToolBar->m_height;
-
- m_frameToolBar->m_x = xx;
- m_frameToolBar->m_y = yy;
- m_frameToolBar->m_height = hh;
- m_frameToolBar->m_width = ww;
-
- gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, xx, yy );
- gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh );
+ if (m_frameToolBar)
+ {
+ int xx = m_miniEdge;
+ int yy = m_miniEdge + m_miniTitle;
+ if ((m_frameMenuBar) || (m_mdiMenuBar)) yy += wxMENU_HEIGHT;
+ int ww = m_width - 2*m_miniEdge;
+ int hh = m_frameToolBar->m_height;
+
+ m_frameToolBar->m_x = xx;
+ m_frameToolBar->m_y = yy;
+ m_frameToolBar->m_height = hh;
+ 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_move( GTK_MYFIXED(m_mainWidget), m_wxwindow, 0, client_area_y_offset );
}
+
+ gtk_widget_set_usize( m_wxwindow, m_width, m_height-client_area_y_offset );
if (m_frameStatusBar)
{
int xx = 0 + m_miniEdge;
- int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
+ int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
int ww = m_width - 2*m_miniEdge;
int hh = wxSTATUS_HEIGHT;
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 */
-
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() );
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();
}
}
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())
+ wxWindow *child = (wxWindow *)NULL;
+ for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
{
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;
}
}
- // 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 );
- wxNode *node = menu->m_items.First();
+ wxNode *node = menu->GetItems().First();
while (node)
{
wxMenuItem *menuitem = (wxMenuItem*)node->Data();
if (m_frameMenuBar)
{
- wxNode *node = m_frameMenuBar->m_menus.First();
+ wxNode *node = m_frameMenuBar->GetMenus().First();
while (node)
{
wxMenu *menu = (wxMenu*)node->Data();
if (m_frameMenuBar->m_parent != this)
{
m_frameMenuBar->m_parent = this;
- gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
+ gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
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 );
}
}
{
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)
{
- int menuId = event.GetMenuId();
- wxString helpString;
helpString = menuBar->GetHelpString(menuId);
- if (helpString != "")
- SetStatusText(helpString);
}
}
+
+ SetStatusText(helpString);
}
}
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)) ;
+ }
+
+ wxEvtHandler* evtHandler = GetEventHandler();
+
+ evtHandler->ProcessEvent(commandEvent);
+}
+
void wxFrame::SetStatusText(const wxString& text, int number)
{
wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
projects / wxWidgets.git / blobdiff