mention wx[Flex]GridSizer too

[wxWidgets.git] / src / univ / themes / gtk.cpp

diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index 9287b7390d30f79a1836096d618cd578656119b1..776d9cd4e70b184d53f9d9d98f5b002cb8a504ee 100644 (file)
--- a/src/univ/themes/gtk.cpp
+++ b/src/univ/themes/gtk.cpp
@@ -48,6 +48,7 @@
 #include "wx/univ/inphand.h"
 #include "wx/univ/colschem.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/colschem.h"
 #include "wx/univ/theme.h"

+#include "wx/toplevel.h"

 
 // ----------------------------------------------------------------------------
 // constants (to be removed, for testing only)
 
 // ----------------------------------------------------------------------------
 // constants (to be removed, for testing only)


@@ -211,7 +212,8 @@ public:
                                    const wxString& title,
                                    const wxIcon& icon,
                                    int flags,
                                    const wxString& title,
                                    const wxIcon& icon,
                                    int flags,

-                                   int pressedButtons = 0);
+                                   int specialButton = 0,
+                                   int specialButtonFlag = 0);

     virtual void DrawFrameBorder(wxDC& dc,
                                  const wxRect& rect,
                                  int flags);
     virtual void DrawFrameBorder(wxDC& dc,
                                  const wxRect& rect,
                                  int flags);


@@ -235,6 +237,7 @@ public:
     virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const;
     virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const;
     virtual wxSize GetFrameIconSize() const;
     virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const;
     virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const;
     virtual wxSize GetFrameIconSize() const;

+    virtual int HitTestFrame(const wxRect& rect, const wxPoint& pt, int flags) const;

 
     virtual void GetComboBitmaps(wxBitmap *bmpNormal,
                                  wxBitmap *bmpFocus,
 
     virtual void GetComboBitmaps(wxBitmap *bmpNormal,
                                  wxBitmap *bmpFocus,


@@ -649,6 +652,8 @@ wxInputHandler *wxGTKTheme::GetInputHandler(const wxString& control)
         else if ( control == wxINP_HANDLER_NOTEBOOK )
             handler = new wxStdNotebookInputHandler(GetDefaultInputHandler());
 #endif // wxUSE_NOTEBOOK
         else if ( control == wxINP_HANDLER_NOTEBOOK )
             handler = new wxStdNotebookInputHandler(GetDefaultInputHandler());
 #endif // wxUSE_NOTEBOOK

+        else if ( control == wxINP_HANDLER_TOPLEVEL )
+            handler = new wxStdFrameInputHandler(GetDefaultInputHandler());

         else
             handler = GetDefaultInputHandler();
 
         else
             handler = GetDefaultInputHandler();
 


@@ -2379,7 +2384,8 @@ void wxGTKRenderer::DrawFrameTitleBar(wxDC& dc,
                                       const wxString& title,
                                       const wxIcon& icon,
                                       int flags,
                                       const wxString& title,
                                       const wxIcon& icon,
                                       int flags,

-                                      int pressedButtons)
+                                      int specialButton,
+                                      int specialButtonFlag)

 {
 }
 
 {
 }
 


@@ -2431,6 +2437,11 @@ wxSize wxGTKRenderer::GetFrameIconSize() const
     return wxSize(-1, -1);
 }
 
     return wxSize(-1, -1);
 }
 

+int wxGTKRenderer::HitTestFrame(const wxRect& rect, const wxPoint& pt, int flags) const
+{
+    return wxHT_TOPLEVEL_CLIENT_AREA;
+}
+

 
 
 // ============================================================================
 
 
 // ============================================================================