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

Removed bug that made wxWindow call OnPaint

Browse Source 
twice and return wrog values for GetClientSize()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-07-14 15:36:37 +00:00
parent 4705ee2dde
commit 98d3fdbedd
4 changed files with 134 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/win_gtk.c
View File

@@ -10,6 +10,7 @@
#include "wx/gtk/win_gtk.h" #include "wx/gtk/win_gtk.h"
#include "gtk/gtksignal.h" #include "gtk/gtksignal.h"
#include "gtk/gtknotebook.h" #include "gtk/gtknotebook.h"
#include "gtk/gtkscrolledwindow.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -536,15 +537,15 @@ gtk_myfixed_size_allocate (GtkWidget *widget,
child = children->data; child = children->data;
children = children->next; children = children->next;
/* please look at the text in wxWindow::DoSetSize() on why the
test GTK_WIDGET_REALIZED() has to be here */
if (GTK_WIDGET_VISIBLE (child->widget)) if (GTK_WIDGET_VISIBLE (child->widget))
{ {
/* please look at the text in wxWindow::DoSetSize() on why the
test GTK_WIDGET_REALIZED() has to be here */
/* if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget)) /* if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget))
{ {
gtk_widget_queue_resize( child->widget ); gtk_widget_queue_resize( child->widget );
} }
else */ else */
{ {
child_allocation.x = child->x; child_allocation.x = child->x;
child_allocation.y = child->y; child_allocation.y = child->y;

115
src/gtk/window.cpp
View File

@@ -661,7 +661,10 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win ) static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win )
{ {
if ( !win->m_hasVMT ) if (!win->m_hasVMT)
return;
if (gdk_event->window != win->m_wxwindow->window)
return; return;
win->GetUpdateRegion().Union( gdk_event->area.x, win->GetUpdateRegion().Union( gdk_event->area.x,
@@ -669,20 +672,23 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
gdk_event->area.width, gdk_event->area.width,
gdk_event->area.height ); gdk_event->area.height );
if ( gdk_event->count > 0 ) if (gdk_event->count > 0)
return; return;
/*
printf( "OnExpose from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
printf( win->GetClassInfo()->GetClassName() );
printf( ".\n" );
*/
wxPaintEvent event( win->GetId() ); wxPaintEvent event( win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
/*
wxPrintf( "OnExpose from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
wxPrintf( win->GetClassInfo()->GetClassName() );
wxPrintf( " %d %d %d %d\n", (int)gdk_event->area.x,
(int)gdk_event->area.y,
(int)gdk_event->area.width,
(int)gdk_event->area.height );
*/
win->GetUpdateRegion().Clear(); win->GetUpdateRegion().Clear();
} }
@@ -703,6 +709,17 @@ static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle
wxPaintEvent event( win->GetId() ); wxPaintEvent event( win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
/*
wxPrintf( "OnDraw from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
printf( win->GetClassInfo()->GetClassName() );
wxPrintf( " %d %d %d %d\n", (int)rect->x,
(int)rect->y,
(int)rect->width,
(int)rect->height );
*/
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
win->GetUpdateRegion().Clear(); win->GetUpdateRegion().Clear();
@@ -2243,32 +2260,29 @@ void wxWindow::DoSetClientSize( int width, int height )
int dw = 0; int dw = 0;
int dh = 0; int dh = 0;
if (!m_hasScrolling) GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
{ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
GtkStyleClass *window_class = m_wxwindow->style->klass;
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{
dw += 2 * window_class->xthickness;
dh += 2 * window_class->ythickness;
}
}
else
{
GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
GtkWidget *viewport = scroll_window->viewport; GtkWidget *viewport = scroll_window->viewport;
GtkStyleClass *viewport_class = viewport->style->klass; GtkStyleClass *viewport_class = viewport->style->klass;
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER)) if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{ {
dw += 2 * viewport_class->xthickness; dw += 2 * viewport_class->xthickness;
dh += 2 * viewport_class->ythickness; dh += 2 * viewport_class->ythickness;
} }
#else
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{
/* when using GTK 1.2 we set the border size to 2 */
dw += 2 * 2;
dh += 2 * 2;
}
#endif #endif
if (HasScrolling())
{
/* /*
GtkWidget *hscrollbar = scroll_window->hscrollbar; GtkWidget *hscrollbar = scroll_window->hscrollbar;
GtkWidget *vscrollbar = scroll_window->vscrollbar; GtkWidget *vscrollbar = scroll_window->vscrollbar;
@@ -2307,31 +2321,28 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
int dw = 0; int dw = 0;
int dh = 0; int dh = 0;
if (!m_hasScrolling) GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
{ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
GtkStyleClass *window_class = m_wxwindow->style->klass;
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{
dw += 2 * window_class->xthickness;
dh += 2 * window_class->ythickness;
}
}
else
{
GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
GtkWidget *viewport = scroll_window->viewport; GtkWidget *viewport = scroll_window->viewport;
GtkStyleClass *viewport_class = viewport->style->klass; GtkStyleClass *viewport_class = viewport->style->klass;
if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) ) if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{ {
dw += 2 * viewport_class->xthickness; dw += 2 * viewport_class->xthickness;
dh += 2 * viewport_class->ythickness; dh += 2 * viewport_class->ythickness;
} }
#else
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{
/* when using GTK 1.2 we set the border size to 2 */
dw += 2 * 2;
dh += 2 * 2;
}
#endif #endif
if (HasScrolling())
{
/* /*
GtkWidget *hscrollbar = scroll_window->hscrollbar; GtkWidget *hscrollbar = scroll_window->hscrollbar;
GtkWidget *vscrollbar = scroll_window->vscrollbar; GtkWidget *vscrollbar = scroll_window->vscrollbar;
@@ -2350,7 +2361,7 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
dh += 15; /* dh += hscrollbar->allocation.height; */ dh += 15; /* dh += hscrollbar->allocation.height; */
dh += scroll_class->scrollbar_spacing; dh += scroll_class->scrollbar_spacing;
} }
} }
if (width) (*width) = m_width - dw; if (width) (*width) = m_width - dw;
if (height) (*height) = m_height - dh; if (height) (*height) = m_height - dh;

7
src/gtk1/win_gtk.c
View File

@@ -10,6 +10,7 @@
#include "wx/gtk/win_gtk.h" #include "wx/gtk/win_gtk.h"
#include "gtk/gtksignal.h" #include "gtk/gtksignal.h"
#include "gtk/gtknotebook.h" #include "gtk/gtknotebook.h"
#include "gtk/gtkscrolledwindow.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -536,15 +537,15 @@ gtk_myfixed_size_allocate (GtkWidget *widget,
child = children->data; child = children->data;
children = children->next; children = children->next;
/* please look at the text in wxWindow::DoSetSize() on why the
test GTK_WIDGET_REALIZED() has to be here */
if (GTK_WIDGET_VISIBLE (child->widget)) if (GTK_WIDGET_VISIBLE (child->widget))
{ {
/* please look at the text in wxWindow::DoSetSize() on why the
test GTK_WIDGET_REALIZED() has to be here */
/* if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget)) /* if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget))
{ {
gtk_widget_queue_resize( child->widget ); gtk_widget_queue_resize( child->widget );
} }
else */ else */
{ {
child_allocation.x = child->x; child_allocation.x = child->x;
child_allocation.y = child->y; child_allocation.y = child->y;

115
src/gtk1/window.cpp
View File

@@ -661,7 +661,10 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win ) static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win )
{ {
if ( !win->m_hasVMT ) if (!win->m_hasVMT)
return;
if (gdk_event->window != win->m_wxwindow->window)
return; return;
win->GetUpdateRegion().Union( gdk_event->area.x, win->GetUpdateRegion().Union( gdk_event->area.x,
@@ -669,20 +672,23 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
gdk_event->area.width, gdk_event->area.width,
gdk_event->area.height ); gdk_event->area.height );
if ( gdk_event->count > 0 ) if (gdk_event->count > 0)
return; return;
/*
printf( "OnExpose from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
printf( win->GetClassInfo()->GetClassName() );
printf( ".\n" );
*/
wxPaintEvent event( win->GetId() ); wxPaintEvent event( win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
/*
wxPrintf( "OnExpose from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
wxPrintf( win->GetClassInfo()->GetClassName() );
wxPrintf( " %d %d %d %d\n", (int)gdk_event->area.x,
(int)gdk_event->area.y,
(int)gdk_event->area.width,
(int)gdk_event->area.height );
*/
win->GetUpdateRegion().Clear(); win->GetUpdateRegion().Clear();
} }
@@ -703,6 +709,17 @@ static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle
wxPaintEvent event( win->GetId() ); wxPaintEvent event( win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
/*
wxPrintf( "OnDraw from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
printf( win->GetClassInfo()->GetClassName() );
wxPrintf( " %d %d %d %d\n", (int)rect->x,
(int)rect->y,
(int)rect->width,
(int)rect->height );
*/
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
win->GetUpdateRegion().Clear(); win->GetUpdateRegion().Clear();
@@ -2243,32 +2260,29 @@ void wxWindow::DoSetClientSize( int width, int height )
int dw = 0; int dw = 0;
int dh = 0; int dh = 0;
if (!m_hasScrolling) GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
{ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
GtkStyleClass *window_class = m_wxwindow->style->klass;
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{
dw += 2 * window_class->xthickness;
dh += 2 * window_class->ythickness;
}
}
else
{
GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
GtkWidget *viewport = scroll_window->viewport; GtkWidget *viewport = scroll_window->viewport;
GtkStyleClass *viewport_class = viewport->style->klass; GtkStyleClass *viewport_class = viewport->style->klass;
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER)) if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{ {
dw += 2 * viewport_class->xthickness; dw += 2 * viewport_class->xthickness;
dh += 2 * viewport_class->ythickness; dh += 2 * viewport_class->ythickness;
} }
#else
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{
/* when using GTK 1.2 we set the border size to 2 */
dw += 2 * 2;
dh += 2 * 2;
}
#endif #endif
if (HasScrolling())
{
/* /*
GtkWidget *hscrollbar = scroll_window->hscrollbar; GtkWidget *hscrollbar = scroll_window->hscrollbar;
GtkWidget *vscrollbar = scroll_window->vscrollbar; GtkWidget *vscrollbar = scroll_window->vscrollbar;
@@ -2307,31 +2321,28 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
int dw = 0; int dw = 0;
int dh = 0; int dh = 0;
if (!m_hasScrolling) GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
{ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
GtkStyleClass *window_class = m_wxwindow->style->klass;
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{
dw += 2 * window_class->xthickness;
dh += 2 * window_class->ythickness;
}
}
else
{
GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
GtkWidget *viewport = scroll_window->viewport; GtkWidget *viewport = scroll_window->viewport;
GtkStyleClass *viewport_class = viewport->style->klass; GtkStyleClass *viewport_class = viewport->style->klass;
if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) ) if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{ {
dw += 2 * viewport_class->xthickness; dw += 2 * viewport_class->xthickness;
dh += 2 * viewport_class->ythickness; dh += 2 * viewport_class->ythickness;
} }
#else
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
{
/* when using GTK 1.2 we set the border size to 2 */
dw += 2 * 2;
dh += 2 * 2;
}
#endif #endif
if (HasScrolling())
{
/* /*
GtkWidget *hscrollbar = scroll_window->hscrollbar; GtkWidget *hscrollbar = scroll_window->hscrollbar;
GtkWidget *vscrollbar = scroll_window->vscrollbar; GtkWidget *vscrollbar = scroll_window->vscrollbar;
@@ -2350,7 +2361,7 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
dh += 15; /* dh += hscrollbar->allocation.height; */ dh += 15; /* dh += hscrollbar->allocation.height; */
dh += scroll_class->scrollbar_spacing; dh += scroll_class->scrollbar_spacing;
} }
} }
if (width) (*width) = m_width - dw; if (width) (*width) = m_width - dw;
if (height) (*height) = m_height - dh; if (height) (*height) = m_height - dh;