gtk spinctrl code simplification

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

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 9da9393c89f83f676204cbe20f67b835ff026f4f..952ed022d6505a614e07a2b04228e2aa075552e4 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        minifram.cpp
+// Name:        src/gtk/minifram.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,36 +7,32 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "minifram.h"
-#endif
-
-#include "wx/minifram.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_MINIFRAME
 
 
 #if wxUSE_MINIFRAME
 

-#include "wx/dcscreen.h"
+#include "wx/minifram.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dcscreen.h"
+#endif

 
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 #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"
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>

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

-extern bool   g_blockEventsOnDrag;
-extern bool   g_blockEventsOnScroll;
+extern bool        g_blockEventsOnDrag;
+extern bool        g_blockEventsOnScroll;
+extern GtkWidget  *wxGetRootWindow();

 
 //-----------------------------------------------------------------------------
 // local functions
 
 //-----------------------------------------------------------------------------
 // local functions


@@ -46,113 +42,73 @@ extern bool   g_blockEventsOnScroll;
 
 static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h )
 {
 
 static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h )
 {

-    int org_x = 0;    
+    int org_x = 0;

     int org_y = 0;
     gdk_window_get_origin( widget->window, &org_x, &org_y );
     x += org_x;
     y += org_y;
 
     int org_y = 0;
     gdk_window_get_origin( widget->window, &org_x, &org_y );
     x += org_x;
     y += org_y;
 

-    GdkGC *gc = gdk_gc_new( GDK_ROOT_PARENT() );
+    GdkGC *gc = gdk_gc_new( gdk_get_default_root_window() );

     gdk_gc_set_subwindow( gc, GDK_INCLUDE_INFERIORS );
     gdk_gc_set_function( gc, GDK_INVERT );
     gdk_gc_set_subwindow( gc, GDK_INCLUDE_INFERIORS );
     gdk_gc_set_function( gc, GDK_INVERT );

-    
-    gdk_draw_rectangle( GDK_ROOT_PARENT(), gc, FALSE, x, y, w, h );
-    gdk_gc_unref( gc );
+
+    gdk_draw_rectangle( gdk_get_default_root_window(), gc, FALSE, x, y, w, h );
+    g_object_unref (gc);

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

+extern "C" {

 static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxFrame *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
     if (gdk_event->count > 0) return;
 static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxFrame *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
     if (gdk_event->count > 0) return;

-    
-    gtk_draw_shadow( widget->style, 
-                     widget->window,
-                     GTK_STATE_NORMAL,
-                     GTK_SHADOW_OUT,
-                     0, 0,
-                     win->m_width, win->m_height );
-
-    if (!win->m_title.IsEmpty() &&
-        ((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->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_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_gc_unref( gc );
-    }
-}

 
 

-//-----------------------------------------------------------------------------
-// "draw" of m_mainWidget
-//-----------------------------------------------------------------------------
+    GtkPizza *pizza = GTK_PIZZA(widget);

 
 

-static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxFrame *win )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
+    gtk_paint_shadow (widget->style,
+                      pizza->bin_window,
+                      GTK_STATE_NORMAL,
+                      GTK_SHADOW_OUT,
+                      NULL, NULL, NULL, // FIXME: No clipping?
+                      0, 0,
+                      win->m_width, win->m_height);

 
 

-    if (!win->m_hasVMT) return;
-    
-    gtk_draw_shadow( widget->style, 
-                     widget->window,
-                     GTK_STATE_NORMAL,
-                     GTK_SHADOW_OUT,
-                     0, 0,
-                     win->m_width, win->m_height );
-                     
-    if (!win->m_title.IsEmpty() &&
-        ((win->GetWindowStyle() & wxCAPTION) || 
-         (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
+    if (!win->GetTitle().empty() &&
+        ((win->GetWindowStyle() & wxCAPTION) ||
+         (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||

          (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {
          (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {

-        GdkGC *gc = gdk_gc_new( widget->window );
-        GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
-        int x = 2;
-        if (win->GetWindowStyle() & wxSYSTEM_MENU) x = 17;
-        
+        wxClientDC dc(win);
+        dc.SetFont( *wxSMALL_FONT );
+        int height = dc.GetCharHeight();
+
+        GdkGC *gc = gdk_gc_new( pizza->bin_window );

         gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] );
         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_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_gc_unref( gc );
+        gdk_draw_rectangle( pizza->bin_window, gc, TRUE,
+                            3,
+                            3,
+                            win->m_width - 7,
+                            height+1 );
+        g_object_unref (gc);
+
+        // Hack alert
+        dc.m_window = pizza->bin_window;
+        dc.SetTextForeground( *wxWHITE );
+        dc.DrawText( win->GetTitle(), 6, 3 );

     }
 }
     }
 }

+}

 
 //-----------------------------------------------------------------------------
 // "button_press_event" of m_mainWidget
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "button_press_event" of m_mainWidget
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();


@@ -163,8 +119,17 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 
     if (win->m_isDragging) return TRUE;
 
 
     if (win->m_isDragging) return TRUE;
 

+    GtkPizza *pizza = GTK_PIZZA(widget);
+    if (gdk_event->window != pizza->bin_window) return TRUE;
+
+    wxClientDC dc(win);
+    dc.SetFont( *wxSMALL_FONT );
+    int height = dc.GetCharHeight() + 1;
+
+    if (gdk_event->y > height) return TRUE;
+

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

-    
+

     gdk_pointer_grab( widget->window, FALSE,
                       (GdkEventMask)
                          (GDK_BUTTON_PRESS_MASK |
     gdk_pointer_grab( widget->window, FALSE,
                       (GdkEventMask)
                          (GDK_BUTTON_PRESS_MASK |


@@ -175,23 +140,25 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
                           GDK_BUTTON1_MOTION_MASK),
                       (GdkWindow *) NULL,
                       (GdkCursor *) NULL,
                           GDK_BUTTON1_MOTION_MASK),
                       (GdkWindow *) NULL,
                       (GdkCursor *) NULL,

-                      GDK_CURRENT_TIME );
-                     
+                      (unsigned int) 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 );
     win->m_oldX = 0;
     win->m_oldY = 0;
     win->m_diffX = (int)gdk_event->x;
     win->m_diffY = (int)gdk_event->y;
     DrawFrame( widget, 0, 0, win->m_width, win->m_height );
     win->m_oldX = 0;
     win->m_oldY = 0;

-    
-    win->m_isDragging = TRUE;
+
+    win->m_isDragging = true;

 
     return TRUE;
 }
 
     return TRUE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "button_release_event" of m_mainWidget
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "button_release_event" of m_mainWidget
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();


@@ -201,30 +168,32 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
     if (g_blockEventsOnScroll) return TRUE;
 
     if (!win->m_isDragging) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
     if (!win->m_isDragging) return TRUE;

-    
-    win->m_isDragging = FALSE;
-     
+
+    win->m_isDragging = false;
+

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

-    
+

     DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );
     DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );

-    gdk_pointer_ungrab ( GDK_CURRENT_TIME );
-    int org_x = 0;    
+    gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
+    int org_x = 0;

     int org_y = 0;
     gdk_window_get_origin( widget->window, &org_x, &org_y );
     x += org_x - win->m_diffX;
     y += org_y - win->m_diffY;
     win->m_x = x;
     win->m_y = y;
     int org_y = 0;
     gdk_window_get_origin( widget->window, &org_x, &org_y );
     x += org_x - win->m_diffX;
     y += org_y - win->m_diffY;
     win->m_x = x;
     win->m_y = y;

-    gtk_widget_set_uposition( win->m_widget, x, y );
+    gtk_window_move( GTK_WINDOW(win->m_widget), x, y );

 
     return TRUE;
 }
 
     return TRUE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "motion_notify_event" of m_mainWidget
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "motion_notify_event" of m_mainWidget
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();


@@ -234,7 +203,7 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
     if (g_blockEventsOnScroll) return TRUE;
 
     if (!win->m_isDragging) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
     if (!win->m_isDragging) return TRUE;

-    
+

     if (gdk_event->is_hint)
     {
        int x = 0;
     if (gdk_event->is_hint)
     {
        int x = 0;


@@ -250,78 +219,121 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
     win->m_oldX = (int)gdk_event->x - win->m_diffX;
     win->m_oldY = (int)gdk_event->y - win->m_diffY;
     DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );
     win->m_oldX = (int)gdk_event->x - win->m_diffX;
     win->m_oldY = (int)gdk_event->y - win->m_diffY;
     DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );

-    
+

     return TRUE;
 }
     return TRUE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "clicked" of X system button
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "clicked" of X system button
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     mf->Close();
 }
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     mf->Close();
 }

+}

 
 //-----------------------------------------------------------------------------
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 

+static const char *cross_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"5 5 2 1",
+"# c Gray0",
+"  c None",
+/* pixels */
+"#   #",
+" # # ",
+"  #  ",
+" # # ",
+"#   #",
+};
+

 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
 
 bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
 
 bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size,
       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;
 
     if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
         m_miniTitle = 13;

-        
+

     m_miniEdge = 3;
     m_miniEdge = 3;

-    m_isDragging = FALSE;
+    m_isDragging = false;

     m_oldX = -1;
     m_oldY = -1;
     m_diffX = 0;
     m_diffY = 0;
     m_oldX = -1;
     m_oldY = -1;
     m_diffX = 0;
     m_diffY = 0;

-    
+

     wxFrame::Create( parent, id, title, pos, size, style, name );
 
     wxFrame::Create( parent, id, title, pos, size, style, name );
 

+    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 & wxSYSTEM_MENU) &&
         ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
     {
     if ((style & wxSYSTEM_MENU) &&
         ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
     {

-        GtkWidget *close_button = gtk_button_new_with_label( "x" );
-    
-        gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), 
-                         close_button, 
-                         4, 4, 12, 11 );
-    
+        GdkBitmap *mask = (GdkBitmap*) NULL;
+        GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d
+                            (
+                                wxGetRootWindow()->window,
+                                &mask,
+                                NULL,
+                                (char **)cross_xpm
+                            );
+
+        GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
+        g_object_unref (mask);
+        g_object_unref (pixmap);
+        gtk_widget_show( pw );
+
+        GtkWidget *close_button = gtk_button_new();
+#ifdef __WXGTK24__
+        if (!gtk_check_version(2,4,0))
+            gtk_button_set_focus_on_click( GTK_BUTTON(close_button), FALSE );
+#endif
+        gtk_container_add( GTK_CONTAINER(close_button), pw );
+
+        gtk_pizza_put( GTK_PIZZA(m_mainWidget),
+                         close_button,
+                         size.x-16, 4, 11, 11 );
+

         gtk_widget_show( close_button );
         gtk_widget_show( close_button );

-    
-        gtk_signal_connect( GTK_OBJECT(close_button), "clicked",
-          GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+
+        g_signal_connect (close_button, "clicked",
+                          G_CALLBACK (gtk_button_clicked_callback),
+                          this);

     }
     }

-    
+

     /* these are called when the borders are drawn */
     /* these are called when the borders are drawn */

-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",
-        GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
+    g_signal_connect (m_mainWidget, "expose_event",
+                      G_CALLBACK (gtk_window_own_expose_callback), this );

 
 

-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",
-       GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this );
-       

     /* these are required for dragging the mini frame around */
     /* these are required for dragging the mini frame around */

-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_press_event",
-      GTK_SIGNAL_FUNC(gtk_window_button_press_callback), (gpointer)this );
-
-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_release_event",
-      GTK_SIGNAL_FUNC(gtk_window_button_release_callback), (gpointer)this );
+    g_signal_connect (m_mainWidget, "button_press_event",
+                      G_CALLBACK (gtk_window_button_press_callback), this);
+    g_signal_connect (m_mainWidget, "button_release_event",
+                      G_CALLBACK (gtk_window_button_release_callback), this);
+    g_signal_connect (m_mainWidget, "motion_notify_event",
+                      G_CALLBACK (gtk_window_motion_notify_callback), this);
+
+    return true;
+}

 
 

-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "motion_notify_event",
-      GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
+void wxMiniFrame::SetTitle( const wxString &title )
+{
+    wxFrame::SetTitle( title );

 
 

-    return TRUE;
+    gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true );

 }
 
 }
 

-#endif
+#endif // wxUSE_MINIFRAME