X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d355d3fe69153840d740469eddacc3336da2b5ae..c6cdf16c933251be1670f611ba28e48885610b23:/src/gtk1/frame.cpp diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 704c2e6500..99d98fcdb8 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -16,6 +16,10 @@ #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; @@ -29,7 +33,7 @@ extern wxList wxPendingDelete; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -// size +// set size void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win ) { @@ -62,6 +66,19 @@ bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED( 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) @@ -74,12 +91,13 @@ IMPLEMENT_DYNAMIC_CLASS(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 ); }; @@ -87,12 +105,13 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, 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; + m_wxwindow = NULL; + m_mainWindow = NULL; Create( parent, id, title, pos, size, style, name ); wxTopLevelWindows.Insert( this ); }; @@ -102,13 +121,9 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, 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 ); @@ -141,6 +156,9 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, 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 ); @@ -208,10 +226,11 @@ void wxFrame::GetClientSize( int *width, int *height ) const }; }; -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; @@ -238,7 +257,7 @@ void wxFrame::GtkOnSize( int x, int y, int width, int height ) // 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) { @@ -252,18 +271,18 @@ void wxFrame::GtkOnSize( int x, int y, int width, int 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_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_widget_set_uposition( m_frameToolBar->m_widget, 1, wxMENU_HEIGHT ); + 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 ); }; @@ -319,7 +338,9 @@ 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))) + 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 );