fixed wxXmlResource::Load's detection of filenames to be done as early as possible

[wxWidgets.git] / src / gtk / minifram.cpp

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 319159f69e2d5af298bea81df4b50ea4e195bae3..834489387b4e11fa2e4ca659c3714d3c79a9d975 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -13,19 +13,16 @@
 #if wxUSE_MINIFRAME
 
 #include "wx/minifram.h"
 #if wxUSE_MINIFRAME
 
 #include "wx/minifram.h"

-#include "wx/settings.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-    #include "wx/dcscreen.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "gtk/gtk.h"
-#include "wx/gtk/win_gtk.h"
-#include "wx/gtk/private.h"
+#include "wx/gtk/dcclient.h"

 
 

-#include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // data
 
 //-----------------------------------------------------------------------------
 // data


@@ -33,7 +30,6 @@
 
 extern bool        g_blockEventsOnDrag;
 extern bool        g_blockEventsOnScroll;
 
 extern bool        g_blockEventsOnDrag;
 extern bool        g_blockEventsOnScroll;

-extern GtkWidget  *wxGetRootWindow();

 
 //-----------------------------------------------------------------------------
 // "expose_event" of m_mainWidget
 
 //-----------------------------------------------------------------------------
 // "expose_event" of m_mainWidget


@@ -62,17 +58,16 @@ static wxColor LightContrastColour(const wxColour& c)
 }
 
 extern "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;
-
-    GtkPizza *pizza = GTK_PIZZA(widget);
+    if (!win->m_hasVMT || gdk_event->count > 0 ||
+        gdk_event->window != widget->window)
+    {
+        return false;
+    }

 
     gtk_paint_shadow (widget->style,
 
     gtk_paint_shadow (widget->style,

-                      pizza->bin_window,
+                      widget->window,

                       GTK_STATE_NORMAL,
                       GTK_SHADOW_OUT,
                       NULL, NULL, NULL, // FIXME: No clipping?
                       GTK_STATE_NORMAL,
                       GTK_SHADOW_OUT,
                       NULL, NULL, NULL, // FIXME: No clipping?


@@ -80,11 +75,13 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
                       win->m_width, win->m_height);
 
     int style = win->GetWindowStyle();
                       win->m_width, win->m_height);
 
     int style = win->GetWindowStyle();

-    
+

     wxClientDC dc(win);
     wxClientDC dc(win);

-    // Hack alert
-    dc.m_window = pizza->bin_window;
-        
+
+    wxDCImpl *impl = dc.GetImpl();
+    wxClientDCImpl *gtk_impl = wxDynamicCast( impl, wxClientDCImpl );
+    gtk_impl->m_gdkwindow = widget->window; // Hack alert
+

     if (style & wxRESIZE_BORDER)
     {
         dc.SetBrush( *wxGREY_BRUSH );
     if (style & wxRESIZE_BORDER)
     {
         dc.SetBrush( *wxGREY_BRUSH );


@@ -92,25 +89,26 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
         dc.DrawRectangle( win->m_width - 14, win->m_height-14, 14, 14 );
     }
 
         dc.DrawRectangle( win->m_width - 14, win->m_height-14, 14, 14 );
     }
 

-    if (!win->GetTitle().empty() &&
-        ((style & wxCAPTION) ||
-         (style & wxTINY_CAPTION_HORIZ) ||
-         (style & wxTINY_CAPTION_VERT)))
+    if (win->m_miniTitle && !win->GetTitle().empty())

     {
         dc.SetFont( *wxSMALL_FONT );
     {
         dc.SetFont( *wxSMALL_FONT );

-        int height = dc.GetCharHeight();

 
         wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) );
         dc.SetBrush( brush );
         dc.SetPen( *wxTRANSPARENT_PEN );
 
         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( win->m_miniEdge-1, 
+                          win->m_miniEdge-1, 
+                          win->m_width - (2*(win->m_miniEdge-1)),
+                          15  );

 
         dc.SetTextForeground( *wxWHITE );
 
         dc.SetTextForeground( *wxWHITE );

-        dc.DrawText( win->GetTitle(), 6, 3 );
+        dc.DrawText( win->GetTitle(), 6, 4 );

 
         if (style & wxCLOSE_BOX)
 
         if (style & wxCLOSE_BOX)

-            dc.DrawBitmap( win->m_closeButton, win->m_width-19, 3, true );
+            dc.DrawBitmap( win->m_closeButton, win->m_width-18, 3, true );

     }
     }

+    
+    return false;

 }
 }
 
 }
 }
 


@@ -119,30 +117,27 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
+static gboolean
+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 (!win->m_hasVMT || gdk_event->window != widget->window)
+        return false;

     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
     if (win->m_isDragging) return TRUE;
 
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
     if (win->m_isDragging) return TRUE;
 

-    GtkPizza *pizza = GTK_PIZZA(widget);
-    if (gdk_event->window != pizza->bin_window) return TRUE;
-

     int style = win->GetWindowStyle();
 
     int y = (int)gdk_event->y;
     int x = (int)gdk_event->x;
     int style = win->GetWindowStyle();
 
     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))
     {
         GtkWidget *ancestor = gtk_widget_get_toplevel( widget );
 
     if ((style & wxRESIZE_BORDER) &&
         (x > win->m_width-14) && (y > win->m_height-14))
     {
         GtkWidget *ancestor = gtk_widget_get_toplevel( widget );
 

-        GdkWindow *source = GTK_PIZZA(widget)->bin_window;
+        GdkWindow *source = widget->window;

 
         int org_x = 0;
         int org_y = 0;
 
         int org_x = 0;
         int org_y = 0;


@@ -154,12 +149,11 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
                                   org_x + x,
                                   org_y + y,
                                   0);
                                   org_x + x,
                                   org_y + y,
                                   0);

-                                  
+

         return TRUE;
     }
 
         return TRUE;
     }
 

-    if ((style & wxCLOSE_BOX) &&
-        ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
+    if (win->m_miniTitle && (style & wxCLOSE_BOX))

     {
         if ((y > 3) && (y < 19) && (x > win->m_width-19) && (x < win->m_width-3))
         {
     {
         if ((y > 3) && (y < 19) && (x > win->m_width-19) && (x < win->m_width-3))
         {


@@ -167,13 +161,9 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
             return TRUE;
         }
     }
             return TRUE;
         }
     }

-        
-    wxClientDC dc(win);
-    dc.SetFont( *wxSMALL_FONT );
-    int height = dc.GetCharHeight() + 1;
-

 
 

-    if (y > height) return TRUE;
+    if (y >= win->m_miniEdge + win->m_miniTitle)
+        return true;

 
     gdk_window_raise( win->m_widget->window );
 
 
     gdk_window_raise( win->m_widget->window );
 


@@ -185,8 +175,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
                           GDK_POINTER_MOTION_HINT_MASK  |
                           GDK_BUTTON_MOTION_MASK        |
                           GDK_BUTTON1_MOTION_MASK),
                           GDK_POINTER_MOTION_HINT_MASK  |
                           GDK_BUTTON_MOTION_MASK        |
                           GDK_BUTTON1_MOTION_MASK),

-                      (GdkWindow *) NULL,
-                      (GdkCursor *) NULL,
+                      NULL,
+                      NULL,

                       (unsigned int) GDK_CURRENT_TIME );
 
     win->m_diffX = x;
                       (unsigned int) GDK_CURRENT_TIME );
 
     win->m_diffX = x;


@@ -205,14 +195,13 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
+static gboolean
+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 (!win->m_hasVMT || gdk_event->window != widget->window)
+        return false;

     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;

-

     if (!win->m_isDragging) return TRUE;
 
     win->m_isDragging = false;
     if (!win->m_isDragging) return TRUE;
 
     win->m_isDragging = false;


@@ -240,16 +229,17 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
 
 extern "C" {
 static gboolean
 
 extern "C" {
 static gboolean

-gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMiniFrame *win )
+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;
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return FALSE;

+    if (gdk_event->window != widget->window)
+        return false;

 
     gdk_window_set_cursor( widget->window, NULL );
 
     gdk_window_set_cursor( widget->window, NULL );

-    
+

     return FALSE;
 }
 }
     return FALSE;
 }
 }


@@ -259,13 +249,11 @@ gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMin
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gint 
+static gboolean

 gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {
 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 (!win->m_hasVMT || gdk_event->window != widget->window)
+        return false;

     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 


@@ -281,10 +269,10 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
     }
 
     int style = win->GetWindowStyle();
     }
 
     int style = win->GetWindowStyle();

-    
+

     int x = (int)gdk_event->x;
     int y = (int)gdk_event->y;
     int x = (int)gdk_event->x;
     int y = (int)gdk_event->y;

-    
+

     if (!win->m_isDragging)
     {
         if (style & wxRESIZE_BORDER)
     if (!win->m_isDragging)
     {
         if (style & wxRESIZE_BORDER)


@@ -296,7 +284,7 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
         }
         return TRUE;
     }
         }
         return TRUE;
     }

-        
+

     win->m_oldX = x - win->m_diffX;
     win->m_oldY = y - win->m_diffY;
 
     win->m_oldX = x - win->m_diffX;
     win->m_oldY = y - win->m_diffY;
 


@@ -309,7 +297,6 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
     win->m_y = y;
     gtk_window_move( GTK_WINDOW(win->m_widget), x, y );
 
     win->m_y = y;
     gtk_window_move( GTK_WINDOW(win->m_widget), x, y );
 

-

     return TRUE;
 }
 }
     return TRUE;
 }
 }


@@ -330,9 +317,8 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
       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 = 0;
+    if (style & wxCAPTION)

         m_miniTitle = 16;
 
     if (style & wxRESIZE_BORDER)
         m_miniTitle = 16;
 
     if (style & wxRESIZE_BORDER)


@@ -347,13 +333,43 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
 
     wxFrame::Create( parent, id, title, pos, size, style, name );
 
 
     wxFrame::Create( parent, id, title, pos, size, style, name );
 

+    // Use a GtkEventBox for the title and borders. Using m_widget for this
+    // almost works, except that setting the resize cursor has no effect.
+    GtkWidget* eventbox = gtk_event_box_new();
+    gtk_widget_add_events(eventbox,
+        GDK_POINTER_MOTION_MASK |
+        GDK_POINTER_MOTION_HINT_MASK);
+    gtk_widget_show(eventbox);
+    // Use a GtkAlignment to position m_mainWidget inside the decorations
+    GtkWidget* alignment = gtk_alignment_new(0, 0, 1, 1);
+    gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
+        m_miniTitle + m_miniEdge, m_miniEdge, m_miniEdge, m_miniEdge);
+    gtk_widget_show(alignment);
+    // The GtkEventBox and GtkAlignment go between m_widget and m_mainWidget
+    gtk_widget_reparent(m_mainWidget, alignment);
+    gtk_container_add(GTK_CONTAINER(eventbox), alignment);
+    gtk_container_add(GTK_CONTAINER(m_widget), eventbox);
+
+    m_gdkDecor = 0;
+    m_gdkFunc = 0;
+    if (style & wxRESIZE_BORDER)
+       m_gdkFunc = GDK_FUNC_RESIZE;
+    gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height);
+    m_decorSize.Set(0, 0);
+    m_deferShow = false;
+
+    // don't allow sizing smaller than decorations
+    GdkGeometry geom;
+    geom.min_width  = 2 * m_miniEdge;
+    geom.min_height = 2 * m_miniEdge + m_miniTitle;
+    gtk_window_set_geometry_hints(GTK_WINDOW(m_widget), NULL, &geom, GDK_HINT_MIN_SIZE);
+

     if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)))
     {
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
     }
 
     if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)))
     {
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
     }
 

-    if ((style & wxCLOSE_BOX) &&
-        ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
+    if (m_miniTitle && (style & wxCLOSE_BOX))

     {
         wxImage img = wxBitmap((const char*)close_bits, 16, 16).ConvertToImage();
         img.Replace(0,0,0,123,123,123);
     {
         wxImage img = wxBitmap((const char*)close_bits, 16, 16).ConvertToImage();
         img.Replace(0,0,0,123,123,123);


@@ -362,27 +378,53 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     }
 
     /* these are called when the borders are drawn */
     }
 
     /* these are called when the borders are drawn */

-    g_signal_connect (m_mainWidget, "expose_event",
+    g_signal_connect_after(eventbox, "expose_event",

                       G_CALLBACK (gtk_window_own_expose_callback), this );
 
     /* these are required for dragging the mini frame around */
                       G_CALLBACK (gtk_window_own_expose_callback), this );
 
     /* these are required for dragging the mini frame around */

-    g_signal_connect (m_mainWidget, "button_press_event",
+    g_signal_connect (eventbox, "button_press_event",

                       G_CALLBACK (gtk_window_button_press_callback), this);
                       G_CALLBACK (gtk_window_button_press_callback), this);

-    g_signal_connect (m_mainWidget, "button_release_event",
+    g_signal_connect (eventbox, "button_release_event",

                       G_CALLBACK (gtk_window_button_release_callback), this);
                       G_CALLBACK (gtk_window_button_release_callback), this);

-    g_signal_connect (m_mainWidget, "motion_notify_event",
+    g_signal_connect (eventbox, "motion_notify_event",

                       G_CALLBACK (gtk_window_motion_notify_callback), this);
                       G_CALLBACK (gtk_window_motion_notify_callback), this);

-    g_signal_connect (m_mainWidget, "leave_notify_event",
+    g_signal_connect (eventbox, "leave_notify_event",

                       G_CALLBACK (gtk_window_leave_callback), this);
     return true;
 }
 
                       G_CALLBACK (gtk_window_leave_callback), this);
     return true;
 }
 

+void wxMiniFrame::DoGetClientSize(int* width, int* height) const
+{
+    wxFrame::DoGetClientSize(width, height);
+    if (width)
+    {
+        *width -= 2 * m_miniEdge;
+        if (*width < 0) *width = 0;
+    }
+    if (height)
+    {
+        *height -= m_miniTitle + 2 * m_miniEdge;
+        if (*height < 0) *height = 0;
+    }
+}
+
+// Keep min size at least as large as decorations
+void wxMiniFrame::DoSetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
+{
+    const int w = 2 * m_miniEdge;
+    const int h = 2 * m_miniEdge + m_miniTitle;
+    if (minW < w) minW = w;
+    if (minH < h) minH = h;
+    wxFrame::DoSetSizeHints(minW, minH, maxW, maxH, incW, incH);
+}
+

 void wxMiniFrame::SetTitle( const wxString &title )
 {
     wxFrame::SetTitle( title );
 
 void wxMiniFrame::SetTitle( const wxString &title )
 {
     wxFrame::SetTitle( title );
 

-    if (GTK_PIZZA(m_mainWidget)->bin_window)
-        gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true );
+    GtkWidget* widget = GTK_BIN(m_widget)->child;
+    if (widget->window)
+        gdk_window_invalidate_rect(widget->window, NULL, false);

 }
 
 #endif // wxUSE_MINIFRAME
 }
 
 #endif // wxUSE_MINIFRAME