]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/minifram.cpp
64 bit clean implementation
[wxWidgets.git] / src / gtk / minifram.cpp
index da857b0e6e0b487c3ce02d37c0c23a6c376db4d4..7cdf1b9f6235d459975cecdb3cb83b61bd4e73db 100644 (file)
@@ -20,8 +20,7 @@
     #include "wx/image.h"
 #endif
 
-#include "wx/gtk/win_gtk.h"
-#include "wx/gtk/private.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // data
@@ -29,7 +28,6 @@
 
 extern bool        g_blockEventsOnDrag;
 extern bool        g_blockEventsOnScroll;
-extern GtkWidget  *wxGetRootWindow();
 
 //-----------------------------------------------------------------------------
 // "expose_event" of m_mainWidget
@@ -58,17 +56,13 @@ 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)
 {
-    // don't need to install idle handler, its done from "event" signal
-
-    if (!win->m_hasVMT) return;
-    if (gdk_event->count > 0) return;
-
-    GtkPizza *pizza = GTK_PIZZA(widget);
+    if (!win->m_hasVMT || gdk_event->count > 0)
+        return false;
 
     gtk_paint_shadow (widget->style,
-                      pizza->bin_window,
+                      widget->window,
                       GTK_STATE_NORMAL,
                       GTK_SHADOW_OUT,
                       NULL, NULL, NULL, // FIXME: No clipping?
@@ -78,8 +72,16 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
     int style = win->GetWindowStyle();
 
     wxClientDC dc(win);
+
+#if wxUSE_NEW_DC
+    wxImplDC *impl = dc.GetImpl();
+    wxGTKClientImplDC *client_impl = wxDynamicCast( impl, wxGTKClientImplDC );
+    // Hack alert
+    client_impl->m_window = widget->window;
+#else
     // Hack alert
-    dc.m_window = pizza->bin_window;
+    dc.m_window = widget->window;
+#endif
 
     if (style & wxRESIZE_BORDER)
     {
@@ -94,19 +96,23 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
          (style & wxTINY_CAPTION_VERT)))
     {
         dc.SetFont( *wxSMALL_FONT );
-        int height = dc.GetCharHeight();
 
         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.DrawText( win->GetTitle(), 6, 3 );
+        dc.DrawText( win->GetTitle(), 6, 4 );
 
         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;
 }
 }
 
@@ -117,17 +123,12 @@ 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 )
 {
-    // don't need to install idle handler, its done from "event" signal
-
     if (!win->m_hasVMT) return FALSE;
     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;
@@ -138,7 +139,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
     {
         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;
@@ -164,12 +165,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
         }
     }
 
-    wxClientDC dc(win);
-    dc.SetFont( *wxSMALL_FONT );
-    int height = dc.GetCharHeight() + 1;
-
-
-    if (y > height) return TRUE;
+    if (y > win->m_miniEdge-1 + 15) return TRUE;
 
     gdk_window_raise( win->m_widget->window );
 
@@ -203,8 +199,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 )
 {
-    // don't need to install idle handler, its done from "event" signal
-
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
@@ -236,10 +230,10 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
 
 extern "C" {
 static gboolean
-gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMiniFrame *win )
+gtk_window_leave_callback(GtkWidget *widget,
+                          GdkEventCrossing * WXUNUSED(gdk_event),
+                          wxMiniFrame *win)
 {
-    // don't need to install idle handler, its done from "event" signal
-
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return FALSE;
 
@@ -257,8 +251,6 @@ extern "C" {
 static gint
 gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {
-    // don't need to install idle handler, its done from "event" signal
-
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
@@ -303,7 +295,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 );
 
-
     return TRUE;
 }
 }
@@ -324,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;
 
@@ -341,6 +330,38 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
 
     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;
+
+    // need to reset default size after changing m_gdkDecor
+    gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height);
+    m_decorSize.Set(0, 0);
+
+    // 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) );
@@ -356,27 +377,53 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     }
 
     /* 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_signal_connect (m_mainWidget, "button_press_event",
+    g_signal_connect (eventbox, "button_press_event",
                       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_signal_connect (m_mainWidget, "motion_notify_event",
+    g_signal_connect (eventbox, "motion_notify_event",
                       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;
 }
 
+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 );
 
-    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