#include "wx/toolbar.h"
#include "wx/statusbr.h"
#include "wx/mdi.h"
+#include "wx/dcclient.h"
#include "wx/gtk/win_gtk.h"
const wxMENU_HEIGHT = 28;
*/
win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height );
-};
+}
//-----------------------------------------------------------------------------
// delete
win->Close();
return TRUE;
-};
+}
//-----------------------------------------------------------------------------
// configure
win->m_y = event->y;
return FALSE;
-};
+}
//-----------------------------------------------------------------------------
m_wxwindow = NULL;
m_mainWindow = NULL;
wxTopLevelWindows.Insert( this );
-};
+}
wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
m_mainWindow = NULL;
Create( parent, id, title, pos, size, style, name );
wxTopLevelWindows.Insert( this );
-};
+}
bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
gtk_widget_realize( m_mainWindow );
return TRUE;
-};
+}
wxFrame::~wxFrame()
{
wxTopLevelWindows.DeleteObject( this );
if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
-};
+}
bool wxFrame::Show( bool show )
{
wxSizeEvent event( wxSize(m_width,m_height), GetId() );
m_sizeSet = FALSE;
ProcessEvent( event );
- };
+ }
return wxWindow::Show( show );
-};
+}
void wxFrame::Enable( bool enable )
{
wxWindow::Enable( enable );
gtk_widget_set_sensitive( m_mainWindow, enable );
-};
+}
void wxFrame::OnCloseWindow( wxCloseEvent &event )
{
{
this->Destroy();
}
-};
+}
bool wxFrame::Destroy()
{
m_frameToolBar->GetSize( NULL, &y );
(*height) -= y;
}
- };
-};
+ }
+}
+
+void wxFrame::SetClientSize( int const width, int const height )
+{
+ int h = height;
+ if (m_frameMenuBar) h += wxMENU_HEIGHT;
+ if (m_frameStatusBar) h += wxSTATUS_HEIGHT;
+ if (m_frameToolBar)
+ {
+ int y = 0;
+ m_frameToolBar->GetSize( NULL, &y );
+ h += y;
+ }
+ wxWindow::SetClientSize( width, h );
+}
void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
{
{
main_y = wxMENU_HEIGHT;
main_height -= wxMENU_HEIGHT;
- };
+ }
int toolbar_height = 0;
if (m_frameToolBar) m_frameToolBar->GetSize( NULL, &toolbar_height );
{
gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameMenuBar->m_widget, 1, 1 );
gtk_widget_set_usize( m_frameMenuBar->m_widget, width-2, wxMENU_HEIGHT-2 );
- };
+ }
if (m_frameToolBar)
{
gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), 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 );
- };
+ }
m_sizeSet = TRUE;
wxSizeEvent event( wxSize(m_width,m_height), GetId() );
event.SetEventObject( this );
ProcessEvent( event );
-};
+}
void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
{
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);
}
-};
+}
void wxFrame::AddChild( wxWindow *child )
{
gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
}
-};
+}
static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
{
if (menuitem->IsSubMenu())
SetInvokingWindow( menuitem->GetSubMenu(), win );
node = node->Next();
- };
-};
+ }
+}
void wxFrame::SetMenuBar( wxMenuBar *menuBar )
{
if (m_frameMenuBar)
{
+ wxNode *node = m_frameMenuBar->m_menus.First();
+ while (node)
+ {
+ 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 );
}
}
-};
+}
-wxMenuBar *wxFrame::GetMenuBar(void)
+wxMenuBar *wxFrame::GetMenuBar(void) const
{
return m_frameMenuBar;
-};
+}
-wxToolBar *wxFrame::CreateToolBar( long style , wxWindowID id, const wxString& name )
+wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
+ wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
+
m_addPrivateChild = TRUE;
-
- m_frameToolBar = new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
-
+ m_frameToolBar = OnCreateToolBar( style, id, name );
m_addPrivateChild = FALSE;
return m_frameToolBar;
-};
+}
-wxToolBar *wxFrame::GetToolBar(void)
+wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name )
{
- return m_frameToolBar;
-};
+ return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
+}
+
+wxToolBar *wxFrame::GetToolBar(void) const
+{
+ return m_frameToolBar;
+}
wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
{
- if (m_frameStatusBar)
- delete m_frameStatusBar;
+ wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" );
- m_frameStatusBar = new wxStatusBar( this, id, wxPoint(0,0), wxSize(100,20), style, name );
-
- m_frameStatusBar->SetFieldsCount( number );
+ m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
return m_frameStatusBar;
-};
+}
-void wxFrame::SetStatusText( const wxString &text, int number )
+wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
{
- if (m_frameStatusBar) m_frameStatusBar->SetStatusText( text, number );
-};
+ wxStatusBar *statusBar = NULL;
+
+ statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name);
+
+ // Set the height according to the font and the border size
+ wxClientDC dc(statusBar);
+ dc.SetFont( *statusBar->GetFont() );
+
+ long x, y;
+ dc.GetTextExtent( "X", &x, &y );
+
+ int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY());
-void wxFrame::SetStatusWidths( int n, int *width )
+ statusBar->SetSize( -1, -1, 100, height );
+
+ statusBar->SetFieldsCount( number );
+ return statusBar;
+}
+
+void wxFrame::SetStatusText(const wxString& text, int number)
{
- if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width );
-};
+ wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
-wxStatusBar *wxFrame::GetStatusBar(void)
+ m_frameStatusBar->SetStatusText(text, number);
+}
+
+void wxFrame::SetStatusWidths(int n, const int widths_field[] )
+{
+ wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+
+ m_frameStatusBar->SetStatusWidths(n, widths_field);
+}
+
+wxStatusBar *wxFrame::GetStatusBar(void) const
{
return m_frameStatusBar;
-};
+}
void wxFrame::SetTitle( const wxString &title )
{
m_title = title;
+ if (m_title.IsNull()) m_title = "";
gtk_window_set_title( GTK_WINDOW(m_widget), title );
-};
+}
void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW) )
{
projects / wxWidgets.git / blobdiff