X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdd3ed7a8f5e43d44fffef5c7f857f6256dcc67a..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/gtk/minifram.cpp?ds=sidebyside

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 8e4bbef3eb..5f26abaf61 100644
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -12,6 +12,9 @@
 #endif
 
 #include "wx/minifram.h"
+
+#if wxUSE_MINIFRAME
+
 #include "wx/dcscreen.h"
 
 #include "gtk/gtk.h"
@@ -65,39 +68,41 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;
     if (gdk_event->count > 0) return;
     
+    GtkPizza *pizza = GTK_PIZZA(widget);
+    
     gtk_draw_shadow( widget->style, 
-                     widget->window,
-		     GTK_STATE_NORMAL,
-		     GTK_SHADOW_OUT,
-		     0, 0,
-		     win->m_width, win->m_height );
+                     pizza->bin_window,
+                     GTK_STATE_NORMAL,
+                     GTK_SHADOW_OUT,
+                     0, 0,
+                     win->m_width, win->m_height );
 
     if (!win->m_title.IsEmpty() &&
-        ((win->m_windowStyle & wxCAPTION) || 
-	 (win->m_windowStyle & wxTINY_CAPTION_HORIZ) || 
-	 (win->m_windowStyle & wxTINY_CAPTION_VERT)))
+        ((win->GetWindowStyle() & wxCAPTION) || 
+         (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
+         (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {
-        GdkGC *gc = gdk_gc_new( widget->window );
-	GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
-	int x = 2;
-	if (win->m_windowStyle & wxSYSTEM_MENU) x = 18;
-	
+        GdkGC *gc = gdk_gc_new( pizza->bin_window );
+        GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
+        int x = 2;
+        if (win->GetWindowStyle() & wxSYSTEM_MENU) x = 18;
+        
         gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] );
-	gdk_draw_rectangle( widget->window, gc, TRUE, 
-	                    x, 
-	                    3, 
-			    win->m_width - 4 - x,
-			    font->ascent + font->descent+1 );
-			    
+        gdk_draw_rectangle( pizza->bin_window, gc, TRUE, 
+                            x, 
+                            3, 
+                            win->m_width - 4 - x,
+                            font->ascent + font->descent+1 );
+                            
         gdk_gc_set_foreground( gc, &widget->style->white );
-        gdk_draw_string( widget->window, font, gc, 
-	                 x+2, 
-			 3+font->ascent, 
-			 win->m_title.mb_str() );
-	
+        gdk_draw_string( pizza->bin_window, font, gc, 
+                         x+2, 
+                         3+font->ascent, 
+                         win->m_title.mb_str() );
+        
         gdk_gc_unref( gc );
     }
 }
@@ -110,38 +115,40 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;
+    
+    GtkPizza *pizza = GTK_PIZZA(widget);
     
     gtk_draw_shadow( widget->style, 
-                     widget->window,
-		     GTK_STATE_NORMAL,
-		     GTK_SHADOW_OUT,
-		     0, 0,
-		     win->m_width, win->m_height );
-		     
+                     pizza->bin_window,
+                     GTK_STATE_NORMAL,
+                     GTK_SHADOW_OUT,
+                     0, 0,
+                     win->m_width, win->m_height );
+                     
     if (!win->m_title.IsEmpty() &&
-        ((win->m_windowStyle & wxCAPTION) || 
-	 (win->m_windowStyle & wxTINY_CAPTION_HORIZ) || 
-	 (win->m_windowStyle & wxTINY_CAPTION_VERT)))
+        ((win->GetWindowStyle() & wxCAPTION) || 
+         (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
+         (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {
-        GdkGC *gc = gdk_gc_new( widget->window );
-	GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
-	int x = 2;
-	if (win->m_windowStyle & wxSYSTEM_MENU) x = 17;
-	
+        GdkGC *gc = gdk_gc_new( pizza->bin_window );
+        GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
+        int x = 2;
+        if (win->GetWindowStyle() & wxSYSTEM_MENU) x = 17;
+        
         gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] );
-	gdk_draw_rectangle( widget->window, gc, TRUE, 
-	                    x, 
-	                    3, 
-			    win->m_width - 4 - x,
-			    font->ascent + font->descent+1 );
-			    
+        gdk_draw_rectangle( pizza->bin_window, gc, TRUE, 
+                            x, 
+                            3, 
+                            win->m_width - 4 - x,
+                            font->ascent + font->descent+1 );
+                            
         gdk_gc_set_foreground( gc, &widget->style->white );
-        gdk_draw_string( widget->window, font, gc, 
-	                 x+2, 
-			 3+font->ascent, 
-			 win->m_title.mb_str() );
-	
+        gdk_draw_string( pizza->bin_window, font, gc, 
+                         x+2, 
+                         3+font->ascent, 
+                         win->m_title.mb_str() );
+        
         gdk_gc_unref( gc );
     }
 }
@@ -154,24 +161,26 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
-    if (!win->HasVMT()) return FALSE;
+    if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
     if (win->m_isDragging) return TRUE;
 
+    gdk_window_raise( win->m_widget->window );
+    
     gdk_pointer_grab( widget->window, FALSE,
                       (GdkEventMask)
                          (GDK_BUTTON_PRESS_MASK |
                           GDK_BUTTON_RELEASE_MASK |
-                          GDK_POINTER_MOTION_MASK	|
+                          GDK_POINTER_MOTION_MASK        |
                           GDK_POINTER_MOTION_HINT_MASK  |
-                          GDK_BUTTON_MOTION_MASK	|
+                          GDK_BUTTON_MOTION_MASK        |
                           GDK_BUTTON1_MOTION_MASK),
                       (GdkWindow *) NULL,
                       (GdkCursor *) NULL,
                       GDK_CURRENT_TIME );
-		     
+                     
     win->m_diffX = (int)gdk_event->x;
     win->m_diffY = (int)gdk_event->y;
     DrawFrame( widget, 0, 0, win->m_width, win->m_height );
@@ -191,7 +200,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
-    if (!win->HasVMT()) return FALSE;
+    if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
@@ -224,7 +233,7 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
-    if (!win->HasVMT()) return FALSE;
+    if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
@@ -271,10 +280,11 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
       long style, const wxString &name )
 {
     style = style | wxSIMPLE_BORDER;
+    style = style | wxCAPTION;
 
     if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
         m_miniTitle = 13;
-	
+        
     m_miniEdge = 3;
     m_isDragging = FALSE;
     m_oldX = -1;
@@ -289,9 +299,9 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     {
         GtkWidget *close_button = gtk_button_new_with_label( "x" );
     
-        gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), 
-	                 close_button, 
-			 4, 4, 12, 11 );
+        gtk_pizza_put( GTK_PIZZA(m_mainWidget), 
+                         close_button, 
+                         4, 4, 12, 11 );
     
         gtk_widget_show( close_button );
     
@@ -318,3 +328,5 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
 
     return TRUE;
 }
+
+#endif