use "cd dir && make" instead of "cd dir; make" which results in infinite loop

[wxWidgets.git] / utils / glcanvas / gtk / glcanvas.cpp

diff --git a/utils/glcanvas/gtk/glcanvas.cpp b/utils/glcanvas/gtk/glcanvas.cpp
index 5832bac035f6b7cb5b682b9159e2acaeb1dcb7ad..fc5c324d5281539d0db36d92886384f4bcd57420 100644 (file)
--- a/utils/glcanvas/gtk/glcanvas.cpp
+++ b/utils/glcanvas/gtk/glcanvas.cpp
@@ -134,9 +134,9 @@ wxPalette wxGLContext::CreateDefaultPalette()
 
 static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win )
 {
-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;
 
-    win->m_updateRegion.Union( gdk_event->area.x,
+    win->GetUpdateRegion().Union( gdk_event->area.x,
                                gdk_event->area.y,
                                gdk_event->area.width,
                                gdk_event->area.height );
@@ -154,7 +154,7 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
 
-    win->m_updateRegion.Clear();
+    win->GetUpdateRegion().Clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -163,15 +163,15 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
 
 static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxWindow *win )
 {
-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;
 
-    win->m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height );
+    win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height );
 
     wxPaintEvent event( win->GetId() );
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
 
-    win->m_updateRegion.Clear();
+    win->GetUpdateRegion().Clear();
 }
 
 //---------------------------------------------------------------------------
@@ -217,9 +217,12 @@ bool wxGLCanvas::Create( wxWindow *parent,
         int data[] = { GLX_RGBA, 
                       GLX_DOUBLEBUFFER, 
                       GLX_DEPTH_SIZE, 1,  /* use largest available depth buffer */
+                      GLX_RED_SIZE, 1, 
+                      GLX_GREEN_SIZE, 1, 
+                      GLX_BLUE_SIZE, 1, 
+                      GLX_ALPHA_SIZE, 0, 
                       None };
        attribList = (int*) data;
-        printf( "using default values\n" );
     }
     else
     {
@@ -350,7 +353,7 @@ void wxGLCanvas::DoSetSize( int x, int y, int width, int height, int sizeFlags )
         int old_width = m_width;
         int old_height = m_height;
 
-        if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+        if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)
         {
             if (x != -1) m_x = x;
             if (y != -1) m_y = y;