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

Chnaged wxGLCanvas::SetSize() to DoSetSize()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-03-02 11:23:42 +00:00
parent 370ae202e1
commit 180307dac0
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/glcanvas/gtk/glcanvas.cpp
View File

@@ -214,6 +214,8 @@ bool wxGLCanvas::Create( wxWindow *parent, wxWindowID id,
GDK_ENTER_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK ); GDK_LEAVE_NOTIFY_MASK );
GTK_WIDGET_SET_FLAGS( m_glWidget, GTK_CAN_FOCUS );
gtk_widget_pop_visual(); gtk_widget_pop_visual();
gtk_widget_pop_colormap(); gtk_widget_pop_colormap();
@@ -276,7 +278,7 @@ void wxGLCanvas::SetColour( const char *colour )
if (m_glContext) m_glContext->SetColour( 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 if (m_resizing) return; // I don't like recursions
m_resizing = TRUE; m_resizing = TRUE;
@@ -351,11 +353,6 @@ void wxGLCanvas::SetSize( int x, int y, int width, int height, int sizeFlags )
m_resizing = FALSE; m_resizing = FALSE;
} }
void wxGLCanvas::SetSize( int width, int height )
{
SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
}
GtkWidget *wxGLCanvas::GetConnectWidget() GtkWidget *wxGLCanvas::GetConnectWidget()
{ {
return m_glWidget; return m_glWidget;

3
utils/glcanvas/gtk/glcanvas.h
View File

@@ -103,9 +103,8 @@ class wxGLCanvas: public wxScrolledWindow
// implementation // 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 ); int sizeFlags = wxSIZE_AUTO );
virtual void SetSize( int width, int height );
virtual GtkWidget *GetConnectWidget(); virtual GtkWidget *GetConnectWidget();
bool IsOwnGtkWindow( GdkWindow *window ); bool IsOwnGtkWindow( GdkWindow *window );