From: Robert Roebling Date: Tue, 2 Mar 1999 11:23:42 +0000 (+0000) Subject: Chnaged wxGLCanvas::SetSize() to DoSetSize() X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/180307dac043f89f17a9bfebf5a8e27513453d9b Chnaged wxGLCanvas::SetSize() to DoSetSize() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/utils/glcanvas/gtk/glcanvas.cpp b/utils/glcanvas/gtk/glcanvas.cpp index 3ee6ca77c0..91c919b2e4 100644 --- a/utils/glcanvas/gtk/glcanvas.cpp +++ b/utils/glcanvas/gtk/glcanvas.cpp @@ -214,6 +214,8 @@ bool wxGLCanvas::Create( wxWindow *parent, wxWindowID id, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK ); + GTK_WIDGET_SET_FLAGS( m_glWidget, GTK_CAN_FOCUS ); + gtk_widget_pop_visual(); gtk_widget_pop_colormap(); @@ -276,7 +278,7 @@ void wxGLCanvas::SetColour( const char *colour ) if (m_glContext) m_glContext->SetColour( colour ); } -void wxGLCanvas::SetSize( int x, int y, int width, int height, int sizeFlags ) +void wxGLCanvas::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { if (m_resizing) return; // I don't like recursions m_resizing = TRUE; @@ -351,11 +353,6 @@ void wxGLCanvas::SetSize( int x, int y, int width, int height, int sizeFlags ) m_resizing = FALSE; } -void wxGLCanvas::SetSize( int width, int height ) -{ - SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); -} - GtkWidget *wxGLCanvas::GetConnectWidget() { return m_glWidget; diff --git a/utils/glcanvas/gtk/glcanvas.h b/utils/glcanvas/gtk/glcanvas.h index c32e176a61..c407b70f63 100644 --- a/utils/glcanvas/gtk/glcanvas.h +++ b/utils/glcanvas/gtk/glcanvas.h @@ -103,9 +103,8 @@ class wxGLCanvas: public wxScrolledWindow // implementation - virtual void SetSize( int x, int y, int width, int height, + virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO ); - virtual void SetSize( int width, int height ); virtual GtkWidget *GetConnectWidget(); bool IsOwnGtkWindow( GdkWindow *window );