Disabled horizontal report mode scrolling in wxListCtrl

    as it skrews up the display,
  Corrected disabling the closing of top level window
    when there are open (modal) dialogs,
  Minor change to redrawing window-less widgets.

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index bc36ba9125173e8e9d16f75628e7b9275d0972b0..e1928cc532c1d6df189bce13655f2226485487cd 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -25,7 +25,7 @@
 #include "wx/generic/imaglist.h"
 
 #ifndef wxUSE_GENERIC_LIST_EXTENSIONS
 #include "wx/generic/imaglist.h"
 
 #ifndef wxUSE_GENERIC_LIST_EXTENSIONS

-#define wxUSE_GENERIC_LIST_EXTENSIONS 1
+#define wxUSE_GENERIC_LIST_EXTENSIONS 0

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 70c83e3c7732a7b6486978f49a4163f6f7b39f5b..55d5e955114854e6c749e4eba331c7dbd45a7faa 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -267,8 +267,6 @@ bool wxDialog::Create( wxWindow *parent,
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {

-    g_openDialogs++;
-

     wxTopLevelWindows.Append( this );
 
     m_needParent = FALSE;
     wxTopLevelWindows.Append( this );
 
     m_needParent = FALSE;


@@ -345,8 +343,6 @@ wxDialog::~wxDialog()
     {
         wxTheApp->ExitMainLoop();
     }
     {
         wxTheApp->ExitMainLoop();
     }

-    
-    g_openDialogs--;

 }
 
 void wxDialog::SetTitle( const wxString& title )
 }
 
 void wxDialog::SetTitle( const wxString& title )


@@ -631,10 +627,14 @@ int wxDialog::ShowModal()
 
     m_modalShowing = TRUE;
 
 
     m_modalShowing = TRUE;
 

+    g_openDialogs++;
+

     gtk_grab_add( m_widget );
     gtk_main();
     gtk_grab_remove( m_widget );
 
     gtk_grab_add( m_widget );
     gtk_main();
     gtk_grab_remove( m_widget );
 

+    g_openDialogs--;
+

     return GetReturnCode();
 }
 
     return GetReturnCode();
 }
 

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 06e479719239c4228b56d6d17617357ba7d043d7..78bb5fea4f217bbae69f1fc791aac84281d9b887 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -747,6 +747,8 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
     win->GetUpdateRegion().Union( rect->x, rect->y,
                                   rect->width, rect->height );
 
     win->GetUpdateRegion().Union( rect->x, rect->y,
                                   rect->width, rect->height );
 

+    win->m_clipPaintRegion = TRUE;
+    

     wxEraseEvent eevent( win->GetId() );
     eevent.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent(eevent);
     wxEraseEvent eevent( win->GetId() );
     eevent.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent(eevent);


@@ -757,6 +759,8 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
 
     win->GetUpdateRegion().Clear();
     
 
     win->GetUpdateRegion().Clear();
     

+    win->m_clipPaintRegion = FALSE;
+    

     GList *children = pizza->children;
     while (children)
     {
     GList *children = pizza->children;
     while (children)
     {


@@ -765,7 +769,9 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
 
         GdkRectangle child_area;
         if (gtk_widget_intersect (child->widget, rect, &child_area))
 
         GdkRectangle child_area;
         if (gtk_widget_intersect (child->widget, rect, &child_area))

-            gtk_widget_draw (child->widget, (GdkRectangle*) NULL );
+        {
+            gtk_widget_draw (child->widget, &child_area /* (GdkRectangle*) NULL*/ );
+        }

     }
 }
 
     }
 }
 

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 70c83e3c7732a7b6486978f49a4163f6f7b39f5b..55d5e955114854e6c749e4eba331c7dbd45a7faa 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -267,8 +267,6 @@ bool wxDialog::Create( wxWindow *parent,
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {

-    g_openDialogs++;
-

     wxTopLevelWindows.Append( this );
 
     m_needParent = FALSE;
     wxTopLevelWindows.Append( this );
 
     m_needParent = FALSE;


@@ -345,8 +343,6 @@ wxDialog::~wxDialog()
     {
         wxTheApp->ExitMainLoop();
     }
     {
         wxTheApp->ExitMainLoop();
     }

-    
-    g_openDialogs--;

 }
 
 void wxDialog::SetTitle( const wxString& title )
 }
 
 void wxDialog::SetTitle( const wxString& title )


@@ -631,10 +627,14 @@ int wxDialog::ShowModal()
 
     m_modalShowing = TRUE;
 
 
     m_modalShowing = TRUE;
 

+    g_openDialogs++;
+

     gtk_grab_add( m_widget );
     gtk_main();
     gtk_grab_remove( m_widget );
 
     gtk_grab_add( m_widget );
     gtk_main();
     gtk_grab_remove( m_widget );
 

+    g_openDialogs--;
+

     return GetReturnCode();
 }
 
     return GetReturnCode();
 }
 

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 06e479719239c4228b56d6d17617357ba7d043d7..78bb5fea4f217bbae69f1fc791aac84281d9b887 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -747,6 +747,8 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
     win->GetUpdateRegion().Union( rect->x, rect->y,
                                   rect->width, rect->height );
 
     win->GetUpdateRegion().Union( rect->x, rect->y,
                                   rect->width, rect->height );
 

+    win->m_clipPaintRegion = TRUE;
+    

     wxEraseEvent eevent( win->GetId() );
     eevent.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent(eevent);
     wxEraseEvent eevent( win->GetId() );
     eevent.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent(eevent);


@@ -757,6 +759,8 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
 
     win->GetUpdateRegion().Clear();
     
 
     win->GetUpdateRegion().Clear();
     

+    win->m_clipPaintRegion = FALSE;
+    

     GList *children = pizza->children;
     while (children)
     {
     GList *children = pizza->children;
     while (children)
     {


@@ -765,7 +769,9 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
 
         GdkRectangle child_area;
         if (gtk_widget_intersect (child->widget, rect, &child_area))
 
         GdkRectangle child_area;
         if (gtk_widget_intersect (child->widget, rect, &child_area))

-            gtk_widget_draw (child->widget, (GdkRectangle*) NULL );
+        {
+            gtk_widget_draw (child->widget, &child_area /* (GdkRectangle*) NULL*/ );
+        }

     }
 }
 
     }
 }