Added samples.inc to DATAFILES in Makefile.in - is that enough?

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

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 9b0c1f03093aa49da0ea296aeaf8daca28b6b040..7b0c2ad4334dafaace26fcaead1df9d11b6cdd49 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -12,14 +12,17 @@
 #endif
 
 #include "wx/minifram.h"
 #endif
 
 #include "wx/minifram.h"

+
+#if wxUSE_MINIFRAME
+

 #include "wx/dcscreen.h"
 
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/dcscreen.h"
 
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 

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

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -32,8 +35,9 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
-extern bool   g_blockEventsOnScroll;
+extern bool        g_blockEventsOnDrag;
+extern bool        g_blockEventsOnScroll;
+extern GtkWidget  *wxRootWindow;

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


@@ -65,15 +69,41 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;

     if (gdk_event->count > 0) return;
     
     if (gdk_event->count > 0) return;
     

+    GtkPizza *pizza = GTK_PIZZA(widget);
+    

     gtk_draw_shadow( widget->style, 
     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->GetWindowStyle() & wxCAPTION) || 
+         (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
+         (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
+    {
+        GdkGC *gc = gdk_gc_new( pizza->bin_window );
+        GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
+        
+        gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] );
+        gdk_draw_rectangle( pizza->bin_window, gc, TRUE, 
+                            3, 
+                            3, 
+                            win->m_width - 7,
+                            font->ascent + font->descent+1 );
+                            
+        gdk_gc_set_foreground( gc, &widget->style->white );
+        gdk_draw_string( pizza->bin_window, font, gc, 
+                         6, 
+                         3+font->ascent, 
+                         win->m_title.mb_str() );
+        
+        gdk_gc_unref( gc );
+    }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -84,14 +114,40 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     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, 
     
     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->GetWindowStyle() & wxCAPTION) || 
+         (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
+         (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
+    {
+        GdkGC *gc = gdk_gc_new( pizza->bin_window );
+        GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
+        
+        gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] );
+        gdk_draw_rectangle( pizza->bin_window, gc, TRUE, 
+                            3, 
+                            3,
+                            win->m_width - 7,
+                            font->ascent + font->descent+1 );
+                            
+        gdk_gc_set_foreground( gc, &widget->style->white );
+        gdk_draw_string( pizza->bin_window, font, gc, 
+                         6, 
+                         3+font->ascent, 
+                         win->m_title.mb_str() );
+        
+        gdk_gc_unref( gc );
+    }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -102,24 +158,26 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     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;
 
     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_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_POINTER_MOTION_HINT_MASK  |

-                          GDK_BUTTON_MOTION_MASK       |
+                          GDK_BUTTON_MOTION_MASK        |

                           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_diffX = (int)gdk_event->x;
     win->m_diffY = (int)gdk_event->y;
     DrawFrame( widget, 0, 0, win->m_width, win->m_height );


@@ -139,7 +197,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     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 (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 


@@ -151,7 +209,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
     int y = (int)gdk_event->y;
     
     DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );
     int y = (int)gdk_event->y;
     
     DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );

-    gdk_pointer_ungrab ( GDK_CURRENT_TIME );
+    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 );
     int org_x = 0;    
     int org_y = 0;
     gdk_window_get_origin( widget->window, &org_x, &org_y );


@@ -172,7 +230,7 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     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 (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 


@@ -212,6 +270,33 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFram
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 

+static char *cross_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"5 5 16 1",
+"  c Gray0",
+". c #bf0000",
+"X c #00bf00",
+"o c #bfbf00",
+"O c #0000bf",
+"+ c #bf00bf",
+"@ c #00bfbf",
+"# c None",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+" ### ",
+"# # #",
+"## ##",
+"# # #",
+" ### ",
+};
+

 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
 
 bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
 
 bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,


@@ -219,9 +304,12 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
       long style, const wxString &name )
 {
     style = style | wxSIMPLE_BORDER;
       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_miniEdge = 3;

-    m_miniTitle = 13;

     m_isDragging = FALSE;
     m_oldX = -1;
     m_oldY = -1;
     m_isDragging = FALSE;
     m_oldX = -1;
     m_oldY = -1;


@@ -230,15 +318,32 @@ 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 );
 

-    GtkWidget *close_button = gtk_button_new_with_label( "x" );
+    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)))
+    {
+        GdkBitmap *mask = (GdkBitmap*) NULL;
+        GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &mask, NULL, cross_xpm );
+    
+        GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
+        gdk_bitmap_unref( mask );
+        gdk_pixmap_unref( pixmap );
+        gtk_widget_show( pw );

     
     

-    gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), close_button, 4, 4 );
-    gtk_widget_set_usize( close_button, 12, 11 );
+        GtkWidget *close_button = gtk_button_new();
+        gtk_container_add( GTK_CONTAINER(close_button), pw );

     
     

-    gtk_widget_show( close_button );
+        gtk_pizza_put( GTK_PIZZA(m_mainWidget), 
+                         close_button, 
+                         size.x-16, 4, 11, 11 );

     
     

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

     
     /* these are called when the borders are drawn */
     gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",
     
     /* these are called when the borders are drawn */
     gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",


@@ -259,3 +364,5 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
 
     return TRUE;
 }
 
     return TRUE;
 }

+
+#endif