Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabled horizontal report mode scrolling in wxListCtrl

Browse Source 
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
This commit is contained in:
Robert Roebling
2000-03-09 20:04:36 +00:00
parent 9ce192d417
commit 304e5625e5
5 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/listctrl.cpp
View File

@@ -25,7 +25,7 @@
#include "wx/generic/imaglist.h" #include "wx/generic/imaglist.h"
#ifndef wxUSE_GENERIC_LIST_EXTENSIONS #ifndef wxUSE_GENERIC_LIST_EXTENSIONS
#define wxUSE_GENERIC_LIST_EXTENSIONS 1 #define wxUSE_GENERIC_LIST_EXTENSIONS 0
#endif #endif
// ============================================================================ // ============================================================================

8
src/gtk/dialog.cpp
View File

@@ -267,8 +267,6 @@ bool wxDialog::Create( wxWindow *parent,
const wxPoint &pos, const wxSize &size, const wxPoint &pos, const wxSize &size,
long style, const wxString &name ) long style, const wxString &name )
{ {
g_openDialogs++;
wxTopLevelWindows.Append( this ); wxTopLevelWindows.Append( this );
m_needParent = FALSE; 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_grab_add( m_widget );
gtk_main(); gtk_main();
gtk_grab_remove( m_widget ); gtk_grab_remove( m_widget );
g_openDialogs--;
return GetReturnCode(); return GetReturnCode();
} }

8
src/gtk/window.cpp
View File

@@ -747,6 +747,8 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
win->GetUpdateRegion().Union( rect->x, rect->y, win->GetUpdateRegion().Union( rect->x, rect->y,
rect->width, rect->height ); rect->width, rect->height );
win->m_clipPaintRegion = TRUE;
wxEraseEvent eevent( win->GetId() ); wxEraseEvent eevent( win->GetId() );
eevent.SetEventObject( win ); eevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent(eevent); 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; GList *children = pizza->children;
while (children) while (children)
{ {
@@ -765,7 +769,9 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
GdkRectangle child_area; GdkRectangle child_area;
if (gtk_widget_intersect (child->widget, rect, &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*/ );
}
} }
} }

8
src/gtk1/dialog.cpp
View File

@@ -267,8 +267,6 @@ bool wxDialog::Create( wxWindow *parent,
const wxPoint &pos, const wxSize &size, const wxPoint &pos, const wxSize &size,
long style, const wxString &name ) long style, const wxString &name )
{ {
g_openDialogs++;
wxTopLevelWindows.Append( this ); wxTopLevelWindows.Append( this );
m_needParent = FALSE; 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_grab_add( m_widget );
gtk_main(); gtk_main();
gtk_grab_remove( m_widget ); gtk_grab_remove( m_widget );
g_openDialogs--;
return GetReturnCode(); return GetReturnCode();
} }

8
src/gtk1/window.cpp
View File

@@ -747,6 +747,8 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
win->GetUpdateRegion().Union( rect->x, rect->y, win->GetUpdateRegion().Union( rect->x, rect->y,
rect->width, rect->height ); rect->width, rect->height );
win->m_clipPaintRegion = TRUE;
wxEraseEvent eevent( win->GetId() ); wxEraseEvent eevent( win->GetId() );
eevent.SetEventObject( win ); eevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent(eevent); 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; GList *children = pizza->children;
while (children) while (children)
{ {
@@ -765,7 +769,9 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
GdkRectangle child_area; GdkRectangle child_area;
if (gtk_widget_intersect (child->widget, rect, &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*/ );
}
} }
} }