icon support moved to wxBitmap, allowing for fully transparent usage

[wxWidgets.git] / src / gtk1 / frame.cpp

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 43d5161b181fd28b2d3129cff96f5905e8415e6d..71d58cae4d26fb01e701b0be41bf426fe5670144 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -328,7 +328,9 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
 //-----------------------------------------------------------------------------
 
 static void
 //-----------------------------------------------------------------------------
 
 static void

-gtk_frame_map_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
+gtk_frame_map_callback( GtkWidget * WXUNUSED(widget),
+                        GdkEvent * WXUNUSED(event),
+                        wxFrame *win )

 {
     win->m_isIconized = FALSE;
 }
 {
     win->m_isIconized = FALSE;
 }


@@ -338,11 +340,40 @@ gtk_frame_map_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
 //-----------------------------------------------------------------------------
 
 static void
 //-----------------------------------------------------------------------------
 
 static void

-gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
+gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
+                          GdkEvent * WXUNUSED(event),
+                          wxFrame *win )

 {
     win->m_isIconized = TRUE;
 }
 
 {
     win->m_isIconized = TRUE;
 }
 

+//-----------------------------------------------------------------------------
+// "expose_event" of m_client
+//-----------------------------------------------------------------------------
+
+static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win )
+{
+    GtkPizza *pizza = GTK_PIZZA(widget);
+
+    gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL,
+               GTK_SHADOW_NONE, &gdk_event->area, win->m_widget, "base", 0, 0, -1, -1);
+        
+    return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// "draw" of m_client
+//-----------------------------------------------------------------------------
+
+
+static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win )
+{
+    GtkPizza *pizza = GTK_PIZZA(widget);
+
+    gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, 
+               GTK_SHADOW_NONE, rect, win->m_widget, "base", 0, 0, -1, -1);
+}
+

 // ----------------------------------------------------------------------------
 // wxFrame itself
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFrame itself
 // ----------------------------------------------------------------------------


@@ -416,18 +447,32 @@ void wxFrame::Init()
     m_menuBarDetached = FALSE;
     m_toolBarDetached = FALSE;
     m_insertInClientArea = TRUE;
     m_menuBarDetached = FALSE;
     m_toolBarDetached = FALSE;
     m_insertInClientArea = TRUE;

+    m_isFrame = TRUE;

     m_isIconized = FALSE;
     m_fsIsShowing = FALSE;
     m_isIconized = FALSE;
     m_fsIsShowing = FALSE;

+    m_themeEnabled = TRUE;

 }
 
 bool wxFrame::Create( wxWindow *parent,
                       wxWindowID id,
 }
 
 bool wxFrame::Create( wxWindow *parent,
                       wxWindowID id,

-                      const wxString &title,
-                      const wxPoint &pos,
-                      const wxSize &size,
+                      const wxString& title,
+                      const wxPoint& pos,
+                      const wxSize& sizeOrig,

                       long style,
                       const wxString &name )
 {
                       long style,
                       const wxString &name )
 {

+    // always create a frame of some reasonable, even if arbitrary, size (at
+    // least for MSW compatibility)
+    wxSize size = sizeOrig;
+    if ( size.x == -1 || size.y == -1 )
+    {
+        wxSize sizeDpy = wxGetDisplaySize();
+        if ( size.x == -1 )
+            size.x = sizeDpy.x / 3;
+        if ( size.y == -1 )
+            size.y = sizeDpy.y / 5;
+    }
+

     wxTopLevelWindows.Append( this );
 
     m_needParent = FALSE;
     wxTopLevelWindows.Append( this );
 
     m_needParent = FALSE;


@@ -472,6 +517,12 @@ bool wxFrame::Create( wxWindow *parent,
     GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
 
     GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
 

+    /* for m_mainWidget themes */
+    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",
+                GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
+    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",
+                GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
+

 #ifdef __WXDEBUG__
     debug_focus_in( m_mainWidget, wxT("wxFrame::m_mainWidget"), name );
 #endif
 #ifdef __WXDEBUG__
     debug_focus_in( m_mainWidget, wxT("wxFrame::m_mainWidget"), name );
 #endif


@@ -1130,20 +1181,25 @@ void wxFrame::SetIcon( const wxIcon &icon )
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// frame state: maximized/iconized/normal (TODO)
+// frame state: maximized/iconized/normal

 // ----------------------------------------------------------------------------
 
 void wxFrame::Maximize(bool WXUNUSED(maximize))
 {
 // ----------------------------------------------------------------------------
 
 void wxFrame::Maximize(bool WXUNUSED(maximize))
 {

+    wxFAIL_MSG( _T("not implemented") );

 }
 
 bool wxFrame::IsMaximized() const
 {
 }
 
 bool wxFrame::IsMaximized() const
 {

+  //    wxFAIL_MSG( _T("not implemented") );
+
+    // This is an approximation

     return FALSE;
 }
 
 void wxFrame::Restore()
 {
     return FALSE;
 }
 
 void wxFrame::Restore()
 {

+    wxFAIL_MSG( _T("not implemented") );

 }
 
 void wxFrame::Iconize( bool iconize )
 }
 
 void wxFrame::Iconize( bool iconize )