#include "wx/dialog.h"
#include "wx/control.h"
#include "wx/app.h"
+#include "wx/menu.h"
+#include "wx/toolbar.h"
+#include "wx/statusbr.h"
+#include "wx/mdi.h"
#include "wx/gtk/win_gtk.h"
const wxMENU_HEIGHT = 28;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-// size
+// set size
void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
{
return TRUE;
};
+//-----------------------------------------------------------------------------
+// configure
+
+gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+{
+ if (!win->HasVMT()) return FALSE;
+
+ win->m_x = event->x;
+ win->m_y = event->y;
+
+ return FALSE;
+};
+
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxFrame, wxWindow)
wxFrame::wxFrame()
{
- m_doingOnSize = FALSE;
m_frameMenuBar = NULL;
m_frameStatusBar = NULL;
+ m_frameToolBar = NULL;
m_sizeSet = FALSE;
+ m_addPrivateChild = FALSE;
+ m_wxwindow = NULL;
+ m_mainWindow = NULL;
wxTopLevelWindows.Insert( this );
};
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
+ m_frameMenuBar = NULL;
+ m_frameStatusBar = NULL;
+ m_frameToolBar = NULL;
m_sizeSet = FALSE;
+ m_addPrivateChild = FALSE;
+ m_wxwindow = NULL;
+ m_mainWindow = NULL;
Create( parent, id, title, pos, size, style, name );
wxTopLevelWindows.Insert( this );
};
long style, const wxString &name )
{
m_needParent = FALSE;
- m_mainWindow = NULL;
- m_wxwindow = NULL;
PreCreation( parent, id, pos, size, style, name );
- m_doingOnSize = FALSE;
-
m_title = title;
m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
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 );
+ gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
+ GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
+
PostCreation();
gtk_widget_realize( m_mainWindow );
{
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 x, int y, int width, int height )
+void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
{
- m_x = x;
- m_y = y;
+ // due to a bug in gtk, x,y are always 0
+ // m_x = x;
+ // m_y = y;
if ((m_height == height) && (m_width == width) &&
(m_sizeSet)) return;
// m_wxwindow just like any other window.
// not really needed
- gtk_widget_set_usize( m_mainWindow, width, height );
+// gtk_widget_set_usize( m_mainWindow, width, height );
if (m_frameMenuBar)
{
main_height -= wxMENU_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 );
+ int toolbar_height = 0;
+ if (m_frameToolBar) m_frameToolBar->GetSize( NULL, &toolbar_height );
+
+ main_y += toolbar_height;
+ main_height -= toolbar_height;
+
+ gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_wxwindow, main_x, main_y );
+ gtk_widget_set_usize( m_wxwindow, main_width, main_height );
if (m_frameMenuBar)
{
- gtk_widget_set_uposition( m_frameMenuBar->m_widget, 1, 1 );
+ 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 );
// 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 wxFrame::AddChild( wxWindow *child )
+{
+ // wxFrame and wxDialog as children aren't placed into the parents
+
+ if (IS_KIND_OF(child,wxMDIChildFrame)) printf( "wxFrame::AddChild error.\n" );
+
+ if ( IS_KIND_OF(child,wxFrame) || IS_KIND_OF(child,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 );
}
};
-bool wxFrame::CreateStatusBar( int number )
+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;
+};
+
+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 )
if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width );
};
-wxStatusBar *wxFrame::GetStatusBar()
+wxStatusBar *wxFrame::GetStatusBar(void)
{
return m_frameStatusBar;
};
-wxMenuBar *wxFrame::GetMenuBar()
-{
- return m_frameMenuBar;
-};
-
void wxFrame::SetTitle( const wxString &title )
{
m_title = title;
gtk_window_set_title( GTK_WINDOW(m_widget), title );
};
-void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW)
+void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW) )
+{
+ if (m_wxwindow)
+ gdk_window_set_hints( m_wxwindow->window, -1, -1,
+ minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );
+}
+
+void wxFrame::SetIcon( const wxIcon &icon )
{
- // VZ: I don't know a way to set the max size for the window in GTK and have
- // no idea about what incW might be
- gtk_widget_set_usize(m_widget, minW, minH);
+ m_icon = icon;
+ if (!icon.Ok()) return;
+
+ wxMask *mask = icon.GetMask();
+ GdkBitmap *bm = NULL;
+ if (mask) bm = mask->GetBitmap();
+
+ gdk_window_set_icon( m_widget->window, NULL, icon.GetPixmap(), bm );
}
+
projects / wxWidgets.git / blobdiff