Version 0.4 of wxPython for MSW.

[wxWidgets.git] / src / gtk1 / frame.cpp

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 2d3be72e102a5367fe73472ea012abd9845f4988..bead5e36e2218f77d8c0a375bb2d1e09fb62a612 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -23,20 +23,25 @@
 #include "wx/dcclient.h"
 #include "wx/gtk/win_gtk.h"
 
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
 const int wxMENU_HEIGHT    = 28;
 const int wxSTATUS_HEIGHT  = 25;
 
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
 extern wxList wxTopLevelWindows;
 extern wxList wxPendingDelete;
 
 //-----------------------------------------------------------------------------
-// wxFrame
-//-----------------------------------------------------------------------------
-
+// "size_allocate"
 //-----------------------------------------------------------------------------
-// set size
 
-void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
+static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
 {
   if (!win->HasVMT()) return;
 
@@ -51,9 +56,10 @@ void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc,
 }
 
 //-----------------------------------------------------------------------------
-// delete
+// "delete_event"
+//-----------------------------------------------------------------------------
 
-bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
+static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
 {
 /*
   printf( "OnDelete from " );
@@ -68,9 +74,10 @@ bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(
 }
 
 //-----------------------------------------------------------------------------
-// configure
+// "configure_event"
+//-----------------------------------------------------------------------------
 
-gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
 {
   if (!win->HasVMT()) return FALSE;
   
@@ -80,6 +87,8 @@ gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur
   return FALSE;
 }
 
+//-----------------------------------------------------------------------------
+// wxFrame
 //-----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
@@ -181,6 +190,8 @@ wxFrame::~wxFrame()
 
 bool wxFrame::Show( bool show )
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   if (show)
   {
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
@@ -192,20 +203,23 @@ bool wxFrame::Show( bool show )
 
 void wxFrame::Enable( bool enable )
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
+  if (!m_mainWindow) return;
+  
   wxWindow::Enable( enable );
   gtk_widget_set_sensitive( m_mainWindow, enable );
 }
 
 void wxFrame::OnCloseWindow( wxCloseEvent &event )
 {
-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
+  if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy();
 }
 
 bool wxFrame::Destroy()
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   if (!wxPendingDelete.Member(this))
     wxPendingDelete.Append(this);
 
@@ -220,6 +234,8 @@ void wxFrame::ImplementSetPosition(void)
 
 void wxFrame::Centre( int direction )
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (gdk_screen_width () - m_width) / 2;
   if (direction & wxVERTICAL == wxVERTICAL) m_y = (gdk_screen_height () - m_height) / 2;
   ImplementSetPosition();
@@ -227,6 +243,8 @@ void wxFrame::Centre( int direction )
 
 void wxFrame::GetClientSize( int *width, int *height ) const
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   wxWindow::GetClientSize( width, height );
   if (height)
   {
@@ -243,6 +261,8 @@ void wxFrame::GetClientSize( int *width, int *height ) const
 
 void wxFrame::SetClientSize( int const width, int const height )
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   int h = height;
   if (m_frameMenuBar) h += wxMENU_HEIGHT;
   if (m_frameStatusBar) h += wxSTATUS_HEIGHT;
@@ -268,9 +288,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
   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_minWidth;
+  if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
 
-  // VZ: why??
-  //gtk_widget_set_usize( m_widget, width, height );
+  gtk_widget_set_usize( m_widget, width, height );
 
   int main_x = 0;
   int main_y = 0;
@@ -330,6 +353,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   if ( GetAutoLayout() )
     Layout();
   else {
@@ -366,9 +391,15 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 
 void wxFrame::AddChild( wxWindow *child )
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+  wxASSERT_MSG( (m_mainWindow != NULL), "invalid frame" );
+  wxASSERT_MSG( (child != NULL),  "invalid child" );
+  wxASSERT_MSG( (child->m_widget != NULL), "invalid 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,wxMDIChildFrame)) wxFAIL_MSG( "wxFrame::AddChild error.\n" );
   
   if ( IS_KIND_OF(child,wxFrame) || IS_KIND_OF(child,wxDialog))
   {
@@ -412,6 +443,10 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 
 void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+  wxASSERT_MSG( (m_mainWindow != NULL), "invalid frame" );
+  
   m_frameMenuBar = menuBar;
   
   if (m_frameMenuBar)
@@ -440,6 +475,8 @@ wxMenuBar *wxFrame::GetMenuBar(void) const
 
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
 
   m_addPrivateChild = TRUE;
@@ -461,6 +498,8 @@ wxToolBar *wxFrame::GetToolBar(void) const
 
 wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" );
 
   m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
@@ -491,6 +530,8 @@ wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id,
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
 
   m_frameStatusBar->SetStatusText(text, number);
@@ -498,6 +539,8 @@ void wxFrame::SetStatusText(const wxString& text, int number)
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[] )
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
 
   m_frameStatusBar->SetStatusWidths(n, widths_field);
@@ -510,28 +553,17 @@ wxStatusBar *wxFrame::GetStatusBar(void) const
 
 void wxFrame::SetTitle( const wxString &title )
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   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 WXUNUSED(maxW), int WXUNUSED(maxH),
-                           int WXUNUSED(incW), int WXUNUSED(incH) )
-{
-  // gdk_window_set_hints alone doesn't really prevent the user from shrinking
-  // the window to the size smaller than (minW, minH)
-  gtk_widget_set_usize( GTK_WIDGET(m_widget), minW, minH );
-
-  /*
-  gdk_window_set_hints( m_widget->window, -1, -1, 
-                             minW, minH, maxW, maxH,
-                        GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE );
-  */
-}
-
 void wxFrame::SetIcon( const wxIcon &icon )
 {
+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
   m_icon = icon;
   if (!icon.Ok()) return;