More for wxPython 2.0b9 (hopefully the last...)

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

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index ea6f98fe1a5e1dd8601bfea4b528f36311c0cf72..a2659bc997c3166c13195055770912f79b777409 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -21,6 +21,13 @@
 #include "gdk/gdkprivate.h"
 #include "gdk/gdkx.h"
 
 #include "gdk/gdkprivate.h"
 #include "gdk/gdkx.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

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


@@ -56,6 +63,8 @@ static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h )
 
 static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxFrame *win )
 {
 
 static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxFrame *win )
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (!win->HasVMT()) return;
     if (gdk_event->count > 0) return;
     
     if (!win->HasVMT()) return;
     if (gdk_event->count > 0) return;
     


@@ -65,6 +74,32 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
                     GTK_SHADOW_OUT,
                     0, 0,
                     win->m_width, win->m_height );
                     GTK_SHADOW_OUT,
                     0, 0,
                     win->m_width, win->m_height );

+
+    if (!win->m_title.IsEmpty() &&
+        ((win->m_windowStyle & wxCAPTION) || 
+        (win->m_windowStyle & wxTINY_CAPTION_HORIZ) || 
+        (win->m_windowStyle & wxTINY_CAPTION_VERT)))
+    {
+        GdkGC *gc = gdk_gc_new( widget->window );
+       GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
+       int x = 2;
+       if (win->m_windowStyle & 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 );
+    }

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


@@ -73,6 +108,8 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
 
 static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxFrame *win )
 {
 
 static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxFrame *win )
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (!win->HasVMT()) return;
     
     gtk_draw_shadow( widget->style, 
     if (!win->HasVMT()) return;
     
     gtk_draw_shadow( widget->style, 


@@ -81,6 +118,32 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
                     GTK_SHADOW_OUT,
                     0, 0,
                     win->m_width, win->m_height );
                     GTK_SHADOW_OUT,
                     0, 0,
                     win->m_width, win->m_height );

+                    
+    if (!win->m_title.IsEmpty() &&
+        ((win->m_windowStyle & wxCAPTION) || 
+        (win->m_windowStyle & wxTINY_CAPTION_HORIZ) || 
+        (win->m_windowStyle & wxTINY_CAPTION_VERT)))
+    {
+        GdkGC *gc = gdk_gc_new( widget->window );
+       GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
+       int x = 2;
+       if (win->m_windowStyle & wxSYSTEM_MENU) x = 17;
+       
+        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 );
+    }

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


@@ -89,6 +152,8 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
 
 static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {
 
 static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (!win->HasVMT()) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
     if (!win->HasVMT()) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;


@@ -124,6 +189,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 
 static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {
 
 static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (!win->HasVMT()) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
     if (!win->HasVMT()) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;


@@ -155,6 +222,8 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
 
 static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {
 
 static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (!win->HasVMT()) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
     if (!win->HasVMT()) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;


@@ -186,6 +255,8 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
 
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf )
 {
 
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf )
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     mf->Close();
 }
 
     mf->Close();
 }
 


@@ -200,9 +271,11 @@ 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;

-    
+
+    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;


@@ -211,15 +284,19 @@ 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 ((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 );
-    gtk_widget_set_usize( close_button, 12, 11 );
+        gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), close_button, 4, 4 );
+        gtk_widget_set_usize( close_button, 12, 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 );
+        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",