X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85a0a12a9c6fe2885c0de8801e91a2f6d6e4119a..8ca1a013e4e699724040ff1f514dab3b4a11d3c9:/src/gtk/minifram.cpp

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 319159f69e..6353ca9a7e 100644
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -13,20 +13,16 @@
 #if wxUSE_MINIFRAME
 
 #include "wx/minifram.h"
-#include "wx/settings.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/dcscreen.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
+    #include "wx/image.h"
 #endif
 
-#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/private.h"
 
-#include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -62,12 +58,10 @@ static wxColor LightContrastColour(const wxColour& c)
 }
 
 extern "C" {
-static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxMiniFrame *win )
+static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win)
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return;
-    if (gdk_event->count > 0) return;
+    if (!win->m_hasVMT || gdk_event->count > 0)
+        return false;
 
     GtkPizza *pizza = GTK_PIZZA(widget);
 
@@ -80,11 +74,11 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
                       win->m_width, win->m_height);
 
     int style = win->GetWindowStyle();
-    
+
     wxClientDC dc(win);
     // Hack alert
     dc.m_window = pizza->bin_window;
-        
+
     if (style & wxRESIZE_BORDER)
     {
         dc.SetBrush( *wxGREY_BRUSH );
@@ -103,14 +97,15 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
         wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) );
         dc.SetBrush( brush );
         dc.SetPen( *wxTRANSPARENT_PEN );
-        dc.DrawRectangle( 3, 3, win->m_width - 7, height-2 );
+        dc.DrawRectangle( 3, 3, win->m_width - 7, height );
 
         dc.SetTextForeground( *wxWHITE );
         dc.DrawText( win->GetTitle(), 6, 3 );
 
         if (style & wxCLOSE_BOX)
-            dc.DrawBitmap( win->m_closeButton, win->m_width-19, 3, true );
+            dc.DrawBitmap( win->m_closeButton, win->m_width-19, 2, true );
     }
+    return false;
 }
 }
 
@@ -121,8 +116,6 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
 extern "C" {
 static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
@@ -136,7 +129,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 
     int y = (int)gdk_event->y;
     int x = (int)gdk_event->x;
-    
+
     if ((style & wxRESIZE_BORDER) &&
         (x > win->m_width-14) && (y > win->m_height-14))
     {
@@ -154,7 +147,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
                                   org_x + x,
                                   org_y + y,
                                   0);
-                                  
+
         return TRUE;
     }
 
@@ -167,7 +160,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
             return TRUE;
         }
     }
-        
+
     wxClientDC dc(win);
     dc.SetFont( *wxSMALL_FONT );
     int height = dc.GetCharHeight() + 1;
@@ -207,8 +200,6 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 extern "C" {
 static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
@@ -242,14 +233,11 @@ extern "C" {
 static gboolean
 gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMiniFrame *win )
 {
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return FALSE;
 
     gdk_window_set_cursor( widget->window, NULL );
-    
+
     return FALSE;
 }
 }
@@ -259,12 +247,9 @@ gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMin
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static gint 
+static gint
 gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
-
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
@@ -281,10 +266,10 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
     }
 
     int style = win->GetWindowStyle();
-    
+
     int x = (int)gdk_event->x;
     int y = (int)gdk_event->y;
-    
+
     if (!win->m_isDragging)
     {
         if (style & wxRESIZE_BORDER)
@@ -296,7 +281,7 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
         }
         return TRUE;
     }
-        
+
     win->m_oldX = x - win->m_diffX;
     win->m_oldY = y - win->m_diffY;
 
@@ -330,8 +315,6 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
-    style = style | wxCAPTION;
-
     if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
         m_miniTitle = 16;