Made funcs extern...

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

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index a94b16b5d1a2b229812f151953fb1c241985b3c4..9660e9d30eb6fd47b7f21845b4e345b6cdf2e583 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -15,10 +15,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "toplevel.h"
 #endif
 
     #pragma implementation "toplevel.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #ifdef __VMS
 #define XIconifyWindow XICONIFYWINDOW
 #endif
 #ifdef __VMS
 #define XIconifyWindow XICONIFYWINDOW
 #endif


@@ -227,7 +230,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
                         (char *)"base",
                         0, 0, -1, -1);
 
                         (char *)"base",
                         0, 0, -1, -1);
 

-    return TRUE;
+    return FALSE;

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


@@ -386,13 +389,16 @@ bool wxTopLevelWindowGTK::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",
+    if (m_miniEdge == 0) // wxMiniFrame has its own version.
+    {
+       // For m_mainWidget themes
+       gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",

                 GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
 #ifndef __WXGTK20__
                 GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
 #ifndef __WXGTK20__

-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",
+       gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",

                 GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
 #endif
                 GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
 #endif

+    }

 
     // m_wxwindow only represents the client area without toolbar and menubar
     m_wxwindow = gtk_pizza_new();
 
     // m_wxwindow only represents the client area without toolbar and menubar
     m_wxwindow = gtk_pizza_new();


@@ -453,10 +459,15 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
         // All this is for Motif Window Manager "hints" and is supposed to be
         // recognized by other WMs as well.
         if ((style & wxCAPTION) != 0)
         // All this is for Motif Window Manager "hints" and is supposed to be
         // recognized by other WMs as well.
         if ((style & wxCAPTION) != 0)

+        {

             m_gdkDecor |= GDK_DECOR_TITLE;
             m_gdkDecor |= GDK_DECOR_TITLE;

-        if ((style & wxSYSTEM_MENU) != 0)
+        }
+        if ((style & wxCLOSE_BOX) != 0)

         {
             m_gdkFunc |= GDK_FUNC_CLOSE;
         {
             m_gdkFunc |= GDK_FUNC_CLOSE;

+        }
+        if ((style & wxSYSTEM_MENU) != 0)
+        {

             m_gdkDecor |= GDK_DECOR_MENU;
         }
         if ((style & wxMINIMIZE_BOX) != 0)
             m_gdkDecor |= GDK_DECOR_MENU;
         }
         if ((style & wxMINIMIZE_BOX) != 0)


@@ -505,10 +516,10 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
     m_fsIsShowing = show;
 
     GdkWindow *window = m_widget->window;
     m_fsIsShowing = show;
 
     GdkWindow *window = m_widget->window;

-    wxX11FullScreenMethod method = 
+    wxX11FullScreenMethod method =

         wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(),
                                  (WXWindow)GDK_ROOT_WINDOW());
         wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(),
                                  (WXWindow)GDK_ROOT_WINDOW());

-    
+

     if (show)
     {
         m_fsSaveFlag = style;
     if (show)
     {
         m_fsSaveFlag = style;


@@ -521,7 +532,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
                gint client_x, client_y, root_x, root_y;
                gint width, height;
 
                gint client_x, client_y, root_x, root_y;
                gint width, height;
 

-        if (method == wxX11_FS_GENERIC)
+        if (method != wxX11_FS_WMSPEC)

         {
             // don't do it always, Metacity hates it
             m_fsSaveGdkFunc = m_gdkFunc;
         {
             // don't do it always, Metacity hates it
             m_fsSaveGdkFunc = m_gdkFunc;


@@ -530,7 +541,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
             gdk_window_set_decorations(window, (GdkWMDecoration)0);
             gdk_window_set_functions(window, (GdkWMFunction)0);
         }
             gdk_window_set_decorations(window, (GdkWMDecoration)0);
             gdk_window_set_functions(window, (GdkWMFunction)0);
         }

-        
+

                gdk_window_get_origin (m_widget->window, &root_x, &root_y);
                gdk_window_get_geometry (m_widget->window, &client_x, &client_y,
                                         &width, &height, NULL);
                gdk_window_get_origin (m_widget->window, &root_x, &root_y);
                gdk_window_get_geometry (m_widget->window, &client_x, &client_y,
                                         &width, &height, NULL);


@@ -545,7 +556,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
     }
     else
     {
     }
     else
     {

-        if (method == wxX11_FS_GENERIC)
+        if (method != wxX11_FS_WMSPEC)

         {
             // don't do it always, Metacity hates it
             m_gdkFunc = m_fsSaveGdkFunc;
         {
             // don't do it always, Metacity hates it
             m_gdkFunc = m_fsSaveGdkFunc;


@@ -553,12 +564,12 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
             gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor);
             gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);
         }
             gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor);
             gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);
         }

-        
+

         wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
                                 (WXWindow)GDK_ROOT_WINDOW(),
                                 (WXWindow)GDK_WINDOW_XWINDOW(window),
                                 show, &m_fsSaveFrame, method);
         wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
                                 (WXWindow)GDK_ROOT_WINDOW(),
                                 (WXWindow)GDK_WINDOW_XWINDOW(window),
                                 show, &m_fsSaveFrame, method);

-       
+

         SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y,
                 m_fsSaveFrame.width, m_fsSaveFrame.height);
     }
         SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y,
                 m_fsSaveFrame.width, m_fsSaveFrame.height);
     }


@@ -965,4 +976,46 @@ void wxTopLevelWindowGTK::RemoveGrab()
     }
 }
 
     }
 }
 

+
+// helper
+static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region)
+{
+    if (window)
+    {
+        if (region.IsEmpty())
+        {
+            gdk_window_shape_combine_mask(window, NULL, 0, 0);
+        }
+        else
+        {
+#ifdef __WXGTK20__
+        gdk_window_shape_combine_region(window, region.GetRegion(), 0, 0);
+#else
+        wxBitmap bmp = region.ConvertToBitmap();
+        bmp.SetMask(new wxMask(bmp, *wxBLACK));
+        GdkBitmap* mask = bmp.GetMask()->GetBitmap();
+        gdk_window_shape_combine_mask(window, mask, 0, 0);
+#endif
+        return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+
+bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
+{
+    wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
+                 _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
+
+    GdkWindow *window = NULL;
+    if (m_wxwindow)
+    {
+        window = GTK_PIZZA(m_wxwindow)->bin_window;
+        do_shape_combine_region(window, region);
+    }
+    window = m_widget->window;
+    return do_shape_combine_region(window, region);
+}
+

 // vi:sts=4:sw=4:et
 // vi:sts=4:sw=4:et