Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk1/minifram.h b/include/wx/gtk1/minifram.h
index 9f1ebaa3454a8a65c6d0729368d288a39ce6f01c..394bb49529fcbb0cc8c8efbc1dd7af43079b34a8 100644 (file)
--- a/include/wx/gtk1/minifram.h
+++ b/include/wx/gtk1/minifram.h
@@ -1,20 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        minifram.h
+// Name:        wx/gtk1/minifram.h
 // Purpose:     wxMiniFrame class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMINIFRAMEH__
 #define __GTKMINIFRAMEH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/defs.h"
+
+#if wxUSE_MINIFRAME
+
 #include "wx/object.h"
 #include "wx/frame.h"
 
@@ -22,48 +21,46 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxMiniFrame;
+class WXDLLIMPEXP_FWD_CORE wxMiniFrame;
 
 //-----------------------------------------------------------------------------
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 
-class wxMiniFrame: public wxFrame 
+class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame
 {
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+    DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 
 public:
-  inline wxMiniFrame(void) {}
-  inline wxMiniFrame(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
-           const wxString& name = wxFrameNameStr)
-  {
-      Create(parent, id, title, pos, size, style, name);
-  }
-  bool Create(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
-           const wxString& name = wxFrameNameStr);
-          
-  // implementation       
-          
-  bool   m_isDragging;
-  int    m_oldX,m_oldY;
-  int    m_diffX,m_diffY;
-  
-  void DrawFrame( int x, int y );
-  void OnPaint( wxPaintEvent &event );
-  void OnMouse( wxMouseEvent &event );
+    wxMiniFrame() {}
+    wxMiniFrame(wxWindow *parent,
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION,
+            const wxString& name = wxFrameNameStr)
+    {
+        Create(parent, id, title, pos, size, style, name);
+    }
 
-  DECLARE_EVENT_TABLE()
+    bool Create(wxWindow *parent,
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION,
+            const wxString& name = wxFrameNameStr);
+
+    virtual void SetTitle( const wxString &title );
+ // implementation
+
+    bool   m_isDragging;
+    int    m_oldX,m_oldY;
+    int    m_diffX,m_diffY;
 };
 
+#endif
+
 #endif
   //  __GTKMINIFRAMEH__