added support for 2 extra mouse buttons (patch 1757630)

[wxWidgets.git] / include / wx / gtk / minifram.h

diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h
index c8f07a0836f77dee30b78219309934eba1cdfccf..7d925b40a3af862bb861ca4caaa6f0f0749d665a 100644 (file)
--- a/include/wx/gtk/minifram.h
+++ b/include/wx/gtk/minifram.h
@@ -15,13 +15,14 @@
 #if wxUSE_MINIFRAME
 
 #include "wx/object.h"
 #if wxUSE_MINIFRAME
 
 #include "wx/object.h"

+#include "wx/bitmap.h"

 #include "wx/frame.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 #include "wx/frame.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxMiniFrame;
+class WXDLLIMPEXP_FWD_CORE wxMiniFrame;

 
 //-----------------------------------------------------------------------------
 // wxMiniFrame
 
 //-----------------------------------------------------------------------------
 // wxMiniFrame


@@ -38,7 +39,7 @@ public:
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,

-            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
+            long style = wxCAPTION | wxRESIZE_BORDER,

             const wxString& name = wxFrameNameStr)
     {
         Create(parent, id, title, pos, size, style, name);
             const wxString& name = wxFrameNameStr)
     {
         Create(parent, id, title, pos, size, style, name);


@@ -49,7 +50,7 @@ public:
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,

-            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
+            long style = wxCAPTION | wxRESIZE_BORDER,

             const wxString& name = wxFrameNameStr);
 
     virtual void SetTitle( const wxString &title );
             const wxString& name = wxFrameNameStr);
 
     virtual void SetTitle( const wxString &title );


@@ -58,6 +59,7 @@ public:
     bool   m_isDragging;
     int    m_oldX,m_oldY;
     int    m_diffX,m_diffY;
     bool   m_isDragging;
     int    m_oldX,m_oldY;
     int    m_diffX,m_diffY;

+    wxBitmap  m_closeButton;

 };
 
 #endif
 };
 
 #endif