Refresh() problem from DialogEd solved

Unified the naming of GNU pragmas for base classed:
    dialogbase, choicebase, etc.


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

include/wx/choice.h

@@ -17,7 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma interface "choiccmn.h"
+    #pragma interface "choicebase.h"
 #endif
 
 #include "wx/control.h"     // the base class

include/wx/control.h

@@ -17,7 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma interface "ctrlcmn.h"
+    #pragma interface "controlbase.h"
 #endif
 
 #include "wx/window.h"      // base class

include/wx/dialog.h

@@ -12,6 +12,10 @@
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 
+#ifdef __GNUG__
+    #pragma interface "dialogbase.h"
+#endif
+
 #include "wx/defs.h"
 #include "wx/panel.h"
 

include/wx/font.h

@@ -12,6 +12,10 @@
 #ifndef _WX_FONT_H_BASE_
 #define _WX_FONT_H_BASE_
 
+#ifdef __GNUG__
+    #pragma interface "fontbase.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

src/common/choiccmn.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "choiccmn.h"
+    #pragma implementation "choicebase.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

src/common/ctrlcmn.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "ctrlcmn.h"
+    #pragma implementation "controlbase.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

src/common/dlgcmn.cpp

@@ -17,10 +17,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if 0
 #ifdef __GNUG__
-    #pragma implementation
-#endif
+    #pragma implementation "dialogbase.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

src/common/fontcmn.cpp

@@ -17,6 +17,10 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#ifdef __GNUG__
+    #pragma implementation "fontbase.h"
+#endif
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

src/gtk/window.cpp

@@ -2663,40 +2663,24 @@ void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
         }
     }
 
+    /* there is no GTK equivalent of "draw only, don't clear" so we
+       invent our own in the GtkMyFixed widget */
+
     if (!rect)
     {
         if (m_wxwindow)
 	{
-	    /* call the callback directly for preventing GTK from
-	       clearing the background */
-	    int w = 0;
-	    int h = 0;
-	    GetClientSize( &w, &h );
+	    GtkMyFixed *myfixed = GTK_MYFIXED(m_wxwindow);
+	    gboolean old_clear = myfixed->clear_on_draw;
+	    gtk_my_fixed_set_clear( myfixed, FALSE );
 	    
-            GetUpdateRegion().Union( 0, 0, w, h );
-            wxPaintEvent event( GetId() );
-            event.SetEventObject( this );
-            GetEventHandler()->ProcessEvent( event );
-            GetUpdateRegion().Clear();
+            gtk_widget_draw( m_wxwindow, (GdkRectangle*) NULL );
+	    
+	    gtk_my_fixed_set_clear( myfixed, old_clear );
 	}
         else
-	{
             gtk_widget_draw( m_widget, (GdkRectangle*) NULL );
     }
-    }
-    else
-    {
-
-        if (m_wxwindow)
-	{
-	    /* call the callback directly for preventing GTK from
-	       clearing the background */
-            GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height );
-            wxPaintEvent event( GetId() );
-            event.SetEventObject( this );
-            GetEventHandler()->ProcessEvent( event );
-            GetUpdateRegion().Clear();
-	}
     else
     {
         GdkRectangle gdk_rect;
@@ -2705,8 +2689,18 @@ void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
         gdk_rect.width = rect->width;
         gdk_rect.height = rect->height;
 
-            gtk_widget_draw( m_widget, &gdk_rect );
+        if (m_wxwindow)
+	{
+	    GtkMyFixed *myfixed = GTK_MYFIXED(m_wxwindow);
+	    gboolean old_clear = myfixed->clear_on_draw;
+	    gtk_my_fixed_set_clear( myfixed, FALSE );
+	    
+            gtk_widget_draw( m_wxwindow, &gdk_rect );
+	    
+	    gtk_my_fixed_set_clear( myfixed, old_clear );
 	}
+        else
+            gtk_widget_draw( m_widget, &gdk_rect );
     }
 }
 

src/gtk1/window.cpp

@@ -2663,40 +2663,24 @@ void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
         }
     }
 
+    /* there is no GTK equivalent of "draw only, don't clear" so we
+       invent our own in the GtkMyFixed widget */
+
     if (!rect)
     {
         if (m_wxwindow)
 	{
-	    /* call the callback directly for preventing GTK from
-	       clearing the background */
-	    int w = 0;
-	    int h = 0;
-	    GetClientSize( &w, &h );
+	    GtkMyFixed *myfixed = GTK_MYFIXED(m_wxwindow);
+	    gboolean old_clear = myfixed->clear_on_draw;
+	    gtk_my_fixed_set_clear( myfixed, FALSE );
 	    
-            GetUpdateRegion().Union( 0, 0, w, h );
-            wxPaintEvent event( GetId() );
-            event.SetEventObject( this );
-            GetEventHandler()->ProcessEvent( event );
-            GetUpdateRegion().Clear();
+            gtk_widget_draw( m_wxwindow, (GdkRectangle*) NULL );
+	    
+	    gtk_my_fixed_set_clear( myfixed, old_clear );
 	}
         else
-	{
             gtk_widget_draw( m_widget, (GdkRectangle*) NULL );
     }
-    }
-    else
-    {
-
-        if (m_wxwindow)
-	{
-	    /* call the callback directly for preventing GTK from
-	       clearing the background */
-            GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height );
-            wxPaintEvent event( GetId() );
-            event.SetEventObject( this );
-            GetEventHandler()->ProcessEvent( event );
-            GetUpdateRegion().Clear();
-	}
     else
     {
         GdkRectangle gdk_rect;
@@ -2705,8 +2689,18 @@ void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
         gdk_rect.width = rect->width;
         gdk_rect.height = rect->height;
 
-            gtk_widget_draw( m_widget, &gdk_rect );
+        if (m_wxwindow)
+	{
+	    GtkMyFixed *myfixed = GTK_MYFIXED(m_wxwindow);
+	    gboolean old_clear = myfixed->clear_on_draw;
+	    gtk_my_fixed_set_clear( myfixed, FALSE );
+	    
+            gtk_widget_draw( m_wxwindow, &gdk_rect );
+	    
+	    gtk_my_fixed_set_clear( myfixed, old_clear );
 	}
+        else
+            gtk_widget_draw( m_widget, &gdk_rect );
     }
 }