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 3ee6ca77c0e9cf40199b2ba62bb6e145a9103bb4..91c919b2e43b39dbbac56332f17d215d35a6bc73 100644 (file)
--- 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 );
     
       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();
     
     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 );
 }
 
     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;
 {
     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;
 }
 
     m_resizing = FALSE;
 }
 

-void wxGLCanvas::SetSize( int width, int height )
-{
-    SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
-}
-

 GtkWidget *wxGLCanvas::GetConnectWidget()
 {
     return m_glWidget;
 GtkWidget *wxGLCanvas::GetConnectWidget()
 {
     return m_glWidget;

diff --git a/utils/glcanvas/gtk/glcanvas.h b/utils/glcanvas/gtk/glcanvas.h
index c32e176a61f2654b2cbecb872da4ddb88a72a615..c407b70f63aa9042a2eb7b51f5d27aabf923dddc 100644 (file)
--- a/utils/glcanvas/gtk/glcanvas.h
+++ b/utils/glcanvas/gtk/glcanvas.h
@@ -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();
     bool IsOwnGtkWindow( GdkWindow *window );
     
     virtual GtkWidget *GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );