* Big memory bug fixed in socket/getline fixed.

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

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index d48501ac9d10795a7f8a633b7b8eecb365e8d5f6..ab4522cb569f3203ca0cbf979325ee20bccb9b83 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -152,19 +152,10 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
     m_widget = gtk_window_new( win_type );
 
 
     m_widget = gtk_window_new( win_type );
 

-#ifdef __WXDEBUG__
-        debug_focus_in( m_widget, "wxFrame::m_widget", name );
-#endif
-
-    if ((size.x != -1) && (size.y != -1))
-        gtk_widget_set_usize( m_widget, m_width, m_height );
-    if ((pos.x != -1) && (pos.y != -1))
-        gtk_widget_set_uposition( m_widget, m_x, m_y );
-

     gtk_window_set_title( GTK_WINDOW(m_widget), title );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 
     gtk_window_set_title( GTK_WINDOW(m_widget), title );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 

-    gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL );
+    gtk_window_set_policy( GTK_WINDOW(m_widget), 1, 1, 0 );

 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );


@@ -173,22 +164,20 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 

-#ifdef __WXDEBUG__
-        debug_focus_in( m_wxwindow, "wxFrame::m_wxwindow", name );
-#endif
-

     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
 
     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
 

+    if (m_parent) m_parent->AddChild( this );
+
+    PostCreation();
+
+    gtk_widget_realize( m_widget );
+    

     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 );
 
     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 );
 

-    if (m_parent) m_parent->AddChild( this );
-
-    PostCreation();
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -260,11 +249,11 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

-void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
+void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )

 {
 {

-    wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );

 
 

-    /* Don't do anything for children of wxMDIChildFrame */
+    /* don't do anything for children of wxMDIChildFrame */

     if (!m_wxwindow) return;
 
     if (m_resizing) return; // I don't like recursions
     if (!m_wxwindow) return;
 
     if (m_resizing) return; // I don't like recursions


@@ -308,26 +297,21 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))

-            gtk_widget_set_uposition( m_widget, m_x, m_y );
+       {
+            /* m_sizeSet = FALSE; */
+           gtk_widget_set_uposition( m_widget, m_x, m_y );
+       }

     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {
     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {

-       gtk_widget_set_usize( m_widget, m_width, m_height );
+        /* we set the size in GtkOnSize */
+        m_sizeSet = FALSE;

     }
 
     }
 

-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-

     m_resizing = FALSE;
 }
 
     m_resizing = FALSE;
 }
 

-void wxFrame::SetSize( int width, int height )
-{
-    SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
-}
-

 void wxFrame::Centre( int direction )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 void wxFrame::Centre( int direction )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );


@@ -335,8 +319,8 @@ void wxFrame::Centre( int direction )
     int x = 0;
     int y = 0;
 
     int x = 0;
     int y = 0;
 

-    if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
-    if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
+    if ((direction & wxHORIZONTAL) == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
+    if ((direction & wxVERTICAL) == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;

 
     Move( x, y );
 }
 
     Move( x, y );
 }


@@ -364,7 +348,7 @@ void wxFrame::GetClientSize( int *width, int *height ) const
     }
 }
 
     }
 }
 

-void wxFrame::SetClientSize( int const width, int const height )
+void wxFrame::DoSetClientSize( int width, int height )

 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 


@@ -377,7 +361,7 @@ void wxFrame::SetClientSize( int const width, int const height )
         m_frameToolBar->GetSize( (int *) NULL, &y );
         h += y;
     }
         m_frameToolBar->GetSize( (int *) NULL, &y );
         h += y;
     }

-    wxWindow::SetClientSize( width + m_miniEdge*2, h  + m_miniEdge*2 + m_miniTitle );
+    wxWindow::DoSetClientSize( width + m_miniEdge*2, h  + m_miniEdge*2 + m_miniTitle );

 }
 
 void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
 }
 
 void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )


@@ -394,17 +378,16 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     m_width = width;
     m_height = height;
 
     m_width = width;
     m_height = height;
 

+    /* check if size is in legal range */

     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_maxWidth;
     if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
 
     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_maxWidth;
     if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
 

-    gtk_widget_set_usize( m_widget, m_width, m_height );
-
-    // this emulates the new wxMSW behaviour of placing all
-    // frame-subwindows (menu, toolbar..) on one native window
-        // OK, this hurts in the eye, but I don't want to call SetSize()
-        // because I don't want to call any non-native functions here.
+    /* this emulates the new wxMSW behaviour of placing all
+     * frame-subwindows (menu, toolbar..) on one native window
+     * this hurts in the eye, but I don't want to call SetSize()
+     * because I don't want to call any non-native functions here. */

 
     if (m_frameMenuBar)
     {
 
     if (m_frameMenuBar)
     {


@@ -454,16 +437,17 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
     }
 
         gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
     }
 

+    /* we actually set the size of a frame here and no-where else */
+    gtk_widget_set_usize( m_widget, m_width, m_height );
+

     m_sizeSet = TRUE;
 
     /* send size event to frame */
     m_sizeSet = TRUE;
 
     /* send size event to frame */

-

     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 
     /* send size event to status bar */
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 
     /* send size event to status bar */

-

     if (m_frameStatusBar)
     {
         wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );
     if (m_frameStatusBar)
     {
         wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );


@@ -499,10 +483,10 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
     }
     else
     {
     }
     else
     {

-        // no child: go out !
+        /* no child: go out ! */

         if (!GetChildren().First()) return;
 
         if (!GetChildren().First()) return;
 

-        // do we have exactly one child?
+        /* do we have exactly one child? */

         wxWindow *child = (wxWindow *) NULL;
         for(wxNode *node = GetChildren().First(); node; node = node->Next())
         {
         wxWindow *child = (wxWindow *) NULL;
         for(wxNode *node = GetChildren().First(); node; node = node->Next())
         {


@@ -515,13 +499,13 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 #endif
             )
             {
 #endif
             )
             {

-          // it's the second one: do nothing
+                /* it's the second one: do nothing */

                 if (child) return;
                 child = win;
             }
         }
 
                 if (child) return;
                 child = win;
             }
         }
 

-        // yes: set it's size to fill all the frame
+        /* 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-2 );
         int client_x, client_y;
         GetClientSize( &client_x, &client_y );
         child->SetSize( 1, 1, client_x-2, client_y-2 );