A few more things are back to work.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index 8adf62231c2365732e4e378d4d7a6ea9eab7ff64..afb70c1e7249ace6f45329c16e5b44abc8e939fe 100644 (file)
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -80,6 +80,8 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER | wxTAB_TRAVERSAL )
 {
 
+  SetBackgroundColour( *wxWHITE );
+
   (void) new wxButton( this, -1, "wxButton", wxPoint(10,10) );
   
   (void) new wxTextCtrl( this, -1, "wxTextCtrl", wxPoint(10,50) );

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 4208618f55de37fdf250c4147909bb34b8cdc216..2ed58de9aa28f24e2b6013a9919135b0c69b0cee 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2372,39 +2372,40 @@ void wxListCtrl::SetSingleStyle( long style, bool add )
 
 void wxListCtrl::SetWindowStyleFlag( long flag )
 {
-    m_mainWin->DeleteEverything();
+    if (m_mainWin)
+    {
+        m_mainWin->DeleteEverything();
 
-    int width = 0;
-    int height = 0;
-    GetClientSize( &width, &height );
+        int width = 0;
+        int height = 0;
+        GetClientSize( &width, &height );
 
-    m_mainWin->SetMode( flag );
+        m_mainWin->SetMode( flag );
 
-    if (flag & wxLC_REPORT)
-    {
-        if (!HasFlag(wxLC_REPORT))
+        if (flag & wxLC_REPORT)
         {
-//          m_mainWin->SetSize( 0, 24, width, height-24 );
-            if (!m_headerWin)
+            if (!HasFlag(wxLC_REPORT))
             {
-                m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
-            }
-            else
-            {
-//              m_headerWin->SetSize( 0, 0, width, 23 );
-                m_headerWin->Show( TRUE );
+                if (!m_headerWin)
+                {
+                    m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, 
+                     wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
+                }
+                else
+                {  
+                    m_headerWin->Show( TRUE );
+                } 
             }
         }
-    }
-    else
-    {
-        if (HasFlag(wxLC_REPORT))
+        else
         {
-//          m_mainWin->SetSize( 0, 0, width, height );
-            m_headerWin->Show( FALSE );
-        }
+            if (HasFlag(wxLC_REPORT))
+            {
+                m_headerWin->Show( FALSE );
+            }
+       }
     }
-
+    
     wxWindow::SetWindowStyleFlag( flag );
 }
 

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 596c4a5a9ab441e37f2803dd94d56337e9693931..c047ebabdb9be6723c0c0eea8aa61fbda77be125 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -38,14 +38,8 @@ extern wxList wxPendingDelete;
 
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     win->Close();
 
@@ -58,21 +52,17 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED
 
 static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxDialog *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
 
-/*
-    printf( "OnDialogResize from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-   if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-   {
-       win->InternalSetSize( alloc->width, alloc->height );
-   }
+    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+    {
+        win->m_width = alloc->width;
+        win->m_height = alloc->height;
+        win->UpdateSize();
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -81,11 +71,13 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
 
 static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return FALSE;
 
-    win->InternalSetPosition(event->x, event->y);
+    win->m_x = event->x;
+    win->m_y = event->y;
 
     wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
     mevent.SetEventObject( win );

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 3065fbcdba6182f274e1c8ce01cb27a63769de5f..6fe147fa9b587518730efc4cdb0a749d2086394a 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -62,21 +62,17 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar
 
 static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
 
-/*
-    printf( "OnFrameResize from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-   if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-   {
-       win->InternalSetSize( alloc->width, alloc->height );
-   }
+    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+    {
+        win->m_width = alloc->width;
+        win->m_height = alloc->height;
+        win->UpdateSize();
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -85,14 +81,8 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
 static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     win->Close();
 
@@ -105,8 +95,6 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX
 
 static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!win->m_hasVMT) return;
     
     win->m_menuBarDetached = FALSE;
@@ -119,8 +107,6 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 
 static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!win->m_hasVMT) return;
     
     win->m_menuBarDetached = TRUE;
@@ -133,11 +119,10 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 
 static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!win->m_hasVMT) return;
     
     win->m_toolBarDetached = FALSE;
+    
     win->UpdateSize();
 }
 
@@ -161,11 +146,13 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE
 
 static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return FALSE;
 
-    win->InternalSetPosition(event->x, event->y);
+    win->m_x = event->x;
+    win->m_y = event->y;
 
     wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
     mevent.SetEventObject( win );
@@ -184,7 +171,8 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
 static gint 
 gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
@@ -668,8 +656,10 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             int ww = m_width  - 2*m_miniEdge;
             int hh = wxMENU_HEIGHT;
             if (m_menuBarDetached) hh = wxPLACE_HOLDER;
-            m_frameMenuBar->InternalSetPosition(xx, yy);
-            m_frameMenuBar->InternalSetSize(ww, hh);
+            m_frameMenuBar->m_x = xx;
+            m_frameMenuBar->m_y = yy;
+            m_frameMenuBar->m_width = ww;
+            m_frameMenuBar->m_height = hh;
             gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
                                   m_frameMenuBar->m_widget, 
                                   xx, yy, ww, hh );
@@ -689,14 +679,11 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             }
             int ww = m_width - 2*m_miniEdge;
             int hh = m_frameToolBar->m_height;
-            // VZ: according to earlier comments in this file, the tbar height
-            //     shouldn't be changed, so I comment out the next line
-            //     (09.05.99)
-            //if (m_toolBarDetached) hh = wxPLACE_HOLDER; 
-
-            m_frameToolBar->InternalSetPosition(xx, yy);
-            m_frameToolBar->InternalSetSize(ww, hh);
-
+           if (m_toolBarDetached) hh = wxPLACE_HOLDER; 
+            m_frameToolBar->m_x = xx;
+            m_frameToolBar->m_y = yy;
+            /* m_frameToolBar->m_height = hh;   don't change the toolbar's height */
+            m_frameToolBar->m_width = ww;
             gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
                                   m_frameToolBar->m_widget, 
                                   xx, yy, ww, hh );
@@ -723,8 +710,10 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
         int ww = m_width - 2*m_miniEdge;
         int hh = wxSTATUS_HEIGHT;
-        m_frameStatusBar->InternalSetPosition(xx, yy);
-        m_frameStatusBar->InternalSetSize(ww, hh);
+        m_frameStatusBar->m_x = xx;
+        m_frameStatusBar->m_y = yy;
+        m_frameStatusBar->m_width = ww;
+        m_frameStatusBar->m_height = hh;
         gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow), 
                               m_frameStatusBar->m_widget, 
                               xx, yy, ww, hh );

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index a6e4317bcf9373f7d3a35c269cc495cb9b2b14fa..0753a14aa633fe5b8d14365184e64dd9be9cf78d 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -92,8 +92,10 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
     if (!menu_bar) return;
     if (!menu_bar->m_widget) return;
 
-    menu_bar->InternalSetPosition(0, 0);
-    menu_bar->InternalSetSize(m_width, wxMENU_HEIGHT);
+    menu_bar->m_x = 0;
+    menu_bar->m_y = 0;
+    menu_bar->m_width = m_width;
+    menu_bar->m_height = wxMENU_HEIGHT;
     gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
                           menu_bar->m_widget, 
                           0, 0, m_width, wxMENU_HEIGHT );

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index e4267e0a7fc8875a49f174f8bf5dc43518efcf01..a749f18a8328afc8b20786acf4b9877995f3de38 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -209,7 +209,8 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
     gdk_window_get_origin( widget->window, &org_x, &org_y );
     x += org_x - win->m_diffX;
     y += org_y - win->m_diffY;
-    win->InternalSetPosition(x, y);
+    win->m_x = x;
+    win->m_y = y;
     gtk_widget_set_uposition( win->m_widget, x, y );
 
     return TRUE;

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index dcf7519e32e505a5e8a3caaa91f0abb2aa620d5a..1b22724b4ba7a263679b03c2362615e0e7bd9620 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2332,8 +2332,7 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") );
 
-    if (!colour.Ok()) return FALSE;
-    if (m_backgroundColour == colour) return FALSE;
+    if (!wxWindowBase::SetBackgroundColour(colour)) return FALSE;
 
     GtkWidget *connect_widget = GetConnectWidget();
     if (!connect_widget->window) return TRUE;
@@ -2349,7 +2348,7 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour )
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
 
-    if ( sysbg == m_backgroundColour )
+    if (sysbg == m_backgroundColour)
     {
         m_backgroundColour = wxNullColour;
         ApplyWidgetStyle();
@@ -2367,14 +2366,13 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") );
 
-    if (!colour.Ok()) return FALSE;
-    if (m_backgroundColour == colour) return FALSE;
+    if (!wxWindowBase::SetForegroundColour(colour)) return FALSE;
 
     GtkWidget *connect_widget = GetConnectWidget();
     if (!connect_widget->window) return TRUE;
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
-    if ( sysbg == m_foregroundColour )
+    if (sysbg == m_foregroundColour)
     {
         m_backgroundColour = wxNullColour;
         ApplyWidgetStyle();
@@ -2516,9 +2514,8 @@ bool wxWindow::SetFont( const wxFont &font )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, _T(  "invalid window") );
 
-    if (!font.Ok()) return FALSE;
-    if (m_font == font) return FALSE;
-
+    if (!wxWindowBase::SetFont(font)) return FALSE;
+    
     GtkWidget *connect_widget = GetConnectWidget();
     if (!connect_widget->window) return TRUE;
 

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 596c4a5a9ab441e37f2803dd94d56337e9693931..c047ebabdb9be6723c0c0eea8aa61fbda77be125 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -38,14 +38,8 @@ extern wxList wxPendingDelete;
 
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     win->Close();
 
@@ -58,21 +52,17 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED
 
 static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxDialog *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
 
-/*
-    printf( "OnDialogResize from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-   if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-   {
-       win->InternalSetSize( alloc->width, alloc->height );
-   }
+    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+    {
+        win->m_width = alloc->width;
+        win->m_height = alloc->height;
+        win->UpdateSize();
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -81,11 +71,13 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
 
 static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return FALSE;
 
-    win->InternalSetPosition(event->x, event->y);
+    win->m_x = event->x;
+    win->m_y = event->y;
 
     wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
     mevent.SetEventObject( win );

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 3065fbcdba6182f274e1c8ce01cb27a63769de5f..6fe147fa9b587518730efc4cdb0a749d2086394a 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -62,21 +62,17 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar
 
 static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
 
-/*
-    printf( "OnFrameResize from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-   if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-   {
-       win->InternalSetSize( alloc->width, alloc->height );
-   }
+    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+    {
+        win->m_width = alloc->width;
+        win->m_height = alloc->height;
+        win->UpdateSize();
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -85,14 +81,8 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
 static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     win->Close();
 
@@ -105,8 +95,6 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX
 
 static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!win->m_hasVMT) return;
     
     win->m_menuBarDetached = FALSE;
@@ -119,8 +107,6 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 
 static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!win->m_hasVMT) return;
     
     win->m_menuBarDetached = TRUE;
@@ -133,11 +119,10 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 
 static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!win->m_hasVMT) return;
     
     win->m_toolBarDetached = FALSE;
+    
     win->UpdateSize();
 }
 
@@ -161,11 +146,13 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE
 
 static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return FALSE;
 
-    win->InternalSetPosition(event->x, event->y);
+    win->m_x = event->x;
+    win->m_y = event->y;
 
     wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
     mevent.SetEventObject( win );
@@ -184,7 +171,8 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
 static gint 
 gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
@@ -668,8 +656,10 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             int ww = m_width  - 2*m_miniEdge;
             int hh = wxMENU_HEIGHT;
             if (m_menuBarDetached) hh = wxPLACE_HOLDER;
-            m_frameMenuBar->InternalSetPosition(xx, yy);
-            m_frameMenuBar->InternalSetSize(ww, hh);
+            m_frameMenuBar->m_x = xx;
+            m_frameMenuBar->m_y = yy;
+            m_frameMenuBar->m_width = ww;
+            m_frameMenuBar->m_height = hh;
             gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
                                   m_frameMenuBar->m_widget, 
                                   xx, yy, ww, hh );
@@ -689,14 +679,11 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             }
             int ww = m_width - 2*m_miniEdge;
             int hh = m_frameToolBar->m_height;
-            // VZ: according to earlier comments in this file, the tbar height
-            //     shouldn't be changed, so I comment out the next line
-            //     (09.05.99)
-            //if (m_toolBarDetached) hh = wxPLACE_HOLDER; 
-
-            m_frameToolBar->InternalSetPosition(xx, yy);
-            m_frameToolBar->InternalSetSize(ww, hh);
-
+           if (m_toolBarDetached) hh = wxPLACE_HOLDER; 
+            m_frameToolBar->m_x = xx;
+            m_frameToolBar->m_y = yy;
+            /* m_frameToolBar->m_height = hh;   don't change the toolbar's height */
+            m_frameToolBar->m_width = ww;
             gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
                                   m_frameToolBar->m_widget, 
                                   xx, yy, ww, hh );
@@ -723,8 +710,10 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
         int ww = m_width - 2*m_miniEdge;
         int hh = wxSTATUS_HEIGHT;
-        m_frameStatusBar->InternalSetPosition(xx, yy);
-        m_frameStatusBar->InternalSetSize(ww, hh);
+        m_frameStatusBar->m_x = xx;
+        m_frameStatusBar->m_y = yy;
+        m_frameStatusBar->m_width = ww;
+        m_frameStatusBar->m_height = hh;
         gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow), 
                               m_frameStatusBar->m_widget, 
                               xx, yy, ww, hh );

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index a6e4317bcf9373f7d3a35c269cc495cb9b2b14fa..0753a14aa633fe5b8d14365184e64dd9be9cf78d 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -92,8 +92,10 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
     if (!menu_bar) return;
     if (!menu_bar->m_widget) return;
 
-    menu_bar->InternalSetPosition(0, 0);
-    menu_bar->InternalSetSize(m_width, wxMENU_HEIGHT);
+    menu_bar->m_x = 0;
+    menu_bar->m_y = 0;
+    menu_bar->m_width = m_width;
+    menu_bar->m_height = wxMENU_HEIGHT;
     gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
                           menu_bar->m_widget, 
                           0, 0, m_width, wxMENU_HEIGHT );

diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp
index e4267e0a7fc8875a49f174f8bf5dc43518efcf01..a749f18a8328afc8b20786acf4b9877995f3de38 100644 (file)
--- a/src/gtk1/minifram.cpp
+++ b/src/gtk1/minifram.cpp
@@ -209,7 +209,8 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
     gdk_window_get_origin( widget->window, &org_x, &org_y );
     x += org_x - win->m_diffX;
     y += org_y - win->m_diffY;
-    win->InternalSetPosition(x, y);
+    win->m_x = x;
+    win->m_y = y;
     gtk_widget_set_uposition( win->m_widget, x, y );
 
     return TRUE;

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index dcf7519e32e505a5e8a3caaa91f0abb2aa620d5a..1b22724b4ba7a263679b03c2362615e0e7bd9620 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2332,8 +2332,7 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") );
 
-    if (!colour.Ok()) return FALSE;
-    if (m_backgroundColour == colour) return FALSE;
+    if (!wxWindowBase::SetBackgroundColour(colour)) return FALSE;
 
     GtkWidget *connect_widget = GetConnectWidget();
     if (!connect_widget->window) return TRUE;
@@ -2349,7 +2348,7 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour )
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
 
-    if ( sysbg == m_backgroundColour )
+    if (sysbg == m_backgroundColour)
     {
         m_backgroundColour = wxNullColour;
         ApplyWidgetStyle();
@@ -2367,14 +2366,13 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") );
 
-    if (!colour.Ok()) return FALSE;
-    if (m_backgroundColour == colour) return FALSE;
+    if (!wxWindowBase::SetForegroundColour(colour)) return FALSE;
 
     GtkWidget *connect_widget = GetConnectWidget();
     if (!connect_widget->window) return TRUE;
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
-    if ( sysbg == m_foregroundColour )
+    if (sysbg == m_foregroundColour)
     {
         m_backgroundColour = wxNullColour;
         ApplyWidgetStyle();
@@ -2516,9 +2514,8 @@ bool wxWindow::SetFont( const wxFont &font )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, _T(  "invalid window") );
 
-    if (!font.Ok()) return FALSE;
-    if (m_font == font) return FALSE;
-
+    if (!wxWindowBase::SetFont(font)) return FALSE;
+    
     GtkWidget *connect_widget = GetConnectWidget();
     if (!connect_widget->window) return TRUE;