// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
printf( ".\n" );
*/
- win->GtkOnSize( alloc->width, alloc->height );
+ win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height );
};
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxFrame, wxWindow)
- EVT_CLOSE(wxFrame::OnCloseWindow)
EVT_SIZE(wxFrame::OnSize)
+ EVT_CLOSE(wxFrame::OnCloseWindow)
+ EVT_IDLE(wxFrame::OnIdle)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
-wxFrame::wxFrame(void)
+wxFrame::wxFrame()
{
m_doingOnSize = FALSE;
m_frameMenuBar = NULL;
m_frameStatusBar = NULL;
+ m_frameToolBar = NULL;
m_sizeSet = FALSE;
+ m_addPrivateChild = FALSE;
wxTopLevelWindows.Insert( this );
};
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
+ m_doingOnSize = FALSE;
+ m_frameMenuBar = NULL;
+ m_frameStatusBar = NULL;
+ m_frameToolBar = NULL;
m_sizeSet = FALSE;
+ m_addPrivateChild = FALSE;
Create( parent, id, title, pos, size, style, name );
wxTopLevelWindows.Insert( this );
};
gtk_container_add( GTK_CONTAINER(m_mainWindow), m_wxwindow );
- m_frameMenuBar = NULL;
- m_frameStatusBar = NULL;
-
gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
return TRUE;
};
-wxFrame::~wxFrame(void)
+wxFrame::~wxFrame()
{
if (m_frameMenuBar) delete m_frameMenuBar;
if (m_frameStatusBar) delete m_frameStatusBar;
gtk_widget_set_sensitive( m_mainWindow, enable );
};
-void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) )
+void wxFrame::OnCloseWindow( wxCloseEvent &event )
{
- this->Destroy();
+ if ( GetEventHandler()->OnClose() || event.GetForce())
+ {
+ this->Destroy();
+ }
};
-bool wxFrame::Destroy(void)
+bool wxFrame::Destroy()
{
if (!wxPendingDelete.Member(this))
wxPendingDelete.Append(this);
{
if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
+ if (m_frameToolBar)
+ {
+ int y = 0;
+ m_frameToolBar->GetSize( NULL, &y );
+ (*height) -= y;
+ }
};
};
-void wxFrame::GtkOnSize( int width, int height )
+void wxFrame::GtkOnSize( int x, int y, int width, int height )
{
+ m_x = x;
+ m_y = y;
+
if ((m_height == height) && (m_width == width) &&
(m_sizeSet)) return;
if (!m_mainWindow) return;
main_height -= wxMENU_HEIGHT;
};
+ int toolbar_height = 0;
+ if (m_frameToolBar) m_frameToolBar->GetSize( NULL, &toolbar_height );
+
+ main_y += toolbar_height;
+ main_height -= toolbar_height;
+
gtk_widget_set_uposition( GTK_WIDGET(m_wxwindow), main_x, main_y );
gtk_widget_set_usize( GTK_WIDGET(m_wxwindow), main_width, main_height );
gtk_widget_set_usize( m_frameMenuBar->m_widget, width-2, wxMENU_HEIGHT-2 );
};
+ if (m_frameToolBar)
+ {
+ gtk_widget_set_uposition( m_frameToolBar->m_widget, 1, wxMENU_HEIGHT );
+ gtk_widget_set_usize( m_frameToolBar->m_widget, width-2, toolbar_height );
+ };
+
if (m_frameStatusBar)
{
m_frameStatusBar->SetSize( 0, main_height-wxSTATUS_HEIGHT, width, wxSTATUS_HEIGHT );
if ( GetAutoLayout() )
Layout();
else {
+ // no child: go out !
+ if (!GetChildren()->First())
+ return;
+
// do we have exactly one child?
wxWindow *child = NULL;
for(wxNode *node = GetChildren()->First(); node; node = node->Next())
{
wxWindow *win = (wxWindow *)node->Data();
- if (!win->IsKindOf(CLASSINFO(wxFrame)) &&
- !win->IsKindOf(CLASSINFO(wxDialog))
-#if 0 // not in m_children anyway
+ if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog)
+#if 0 // not in m_children anyway
&& (win != m_frameMenuBar) &&
+ (win != m_frameToolBar) &&
(win != m_frameStatusBar)
#endif
)
}
};
-void SetInvokingWindow( wxMenu *menu, wxWindow *win )
+void wxFrame::AddChild( wxWindow *child )
+{
+ // wxFrame and wxDialog as children aren't placed into the parents
+
+ if (child->IsKindOf(CLASSINFO(wxFrame)) || child->IsKindOf(CLASSINFO(wxDialog)))
+ {
+ m_children.Append( child );
+
+ if ((child->m_x != -1) && (child->m_y != -1))
+ gtk_widget_set_uposition( child->m_widget, child->m_x, child->m_y );
+
+ return;
+ }
+
+ if (m_addPrivateChild)
+ {
+ gtk_myfixed_put( GTK_MYFIXED(m_mainWindow), child->m_widget, child->m_x, child->m_y );
+
+ gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
+ }
+ else
+ {
+ m_children.Append( child );
+
+ if (m_wxwindow)
+ gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y );
+
+ gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
+ }
+};
+
+static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
{
menu->SetInvokingWindow( win );
wxNode *node = menu->m_items.First();
while (node)
{
wxMenuItem *menuitem = (wxMenuItem*)node->Data();
- if (menuitem->m_isSubMenu) SetInvokingWindow( menuitem->m_subMenu, win );
+ if (menuitem->IsSubMenu())
+ SetInvokingWindow( menuitem->GetSubMenu(), win );
node = node->Next();
};
};
void wxFrame::SetMenuBar( wxMenuBar *menuBar )
{
m_frameMenuBar = menuBar;
-
- wxNode *node = m_frameMenuBar->m_menus.First();
- while (node)
+
+ if (m_frameMenuBar)
{
- wxMenu *menu = (wxMenu*)node->Data();
- SetInvokingWindow( menu, this );
- node = node->Next();
- };
+ if (m_frameMenuBar->m_parent != this)
+ {
+ wxNode *node = m_frameMenuBar->m_menus.First();
+ while (node)
+ {
+ wxMenu *menu = (wxMenu*)node->Data();
+ SetInvokingWindow( menu, this );
+ node = node->Next();
+ };
+
+ m_frameMenuBar->m_parent = this;
+ gtk_myfixed_put( GTK_MYFIXED(m_mainWindow),
+ m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
+ }
+ }
+};
- m_frameMenuBar->m_parent = this;
- gtk_myfixed_put( GTK_MYFIXED(m_mainWindow),
- m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
+wxMenuBar *wxFrame::GetMenuBar(void)
+{
+ return m_frameMenuBar;
+};
+
+wxToolBar *wxFrame::CreateToolBar( long style , wxWindowID id, const wxString& name )
+{
+ m_addPrivateChild = TRUE;
+
+ m_frameToolBar = new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
+
+ m_addPrivateChild = FALSE;
+
+ return m_frameToolBar;
};
-bool wxFrame::CreateStatusBar( int number )
+wxToolBar *wxFrame::GetToolBar(void)
+{
+ return m_frameToolBar;
+};
+
+wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
{
if (m_frameStatusBar)
delete m_frameStatusBar;
- m_frameStatusBar = new wxStatusBar( this, -1, wxPoint(0,0), wxSize(100,20) );
+ m_frameStatusBar = new wxStatusBar( this, id, wxPoint(0,0), wxSize(100,20), style, name );
m_frameStatusBar->SetFieldsCount( number );
- return TRUE;
+
+ return m_frameStatusBar;
};
void wxFrame::SetStatusText( const wxString &text, int number )
return m_frameStatusBar;
};
-wxMenuBar *wxFrame::GetMenuBar(void)
-{
- return m_frameMenuBar;
-};
-
void wxFrame::SetTitle( const wxString &title )
{
m_title = title;
gtk_window_set_title( GTK_WINDOW(m_widget), title );
};
-wxString wxFrame::GetTitle(void) const
+void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW) )
{
- return (wxString&)m_title;
-};
-
+ if (m_wxwindow)
+ gdk_window_set_hints( m_wxwindow->window, -1, -1,
+ minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );
+}
projects / wxWidgets.git / blobdiff