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 1828439281b67d0c050750ebc9bdf129e2743f95..394bb49529fcbb0cc8c8efbc1dd7af43079b34a8 100644 (file)
--- a/include/wx/gtk1/minifram.h
+++ b/include/wx/gtk1/minifram.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        minifram.h
+// Name:        wx/gtk1/minifram.h

 // Purpose:     wxMiniFrame class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:     wxMiniFrame class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -10,11 +10,10 @@
 #ifndef __GTKMINIFRAMEH__
 #define __GTKMINIFRAMEH__
 
 #ifndef __GTKMINIFRAMEH__
 #define __GTKMINIFRAMEH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/defs.h"

+
+#if wxUSE_MINIFRAME
+

 #include "wx/object.h"
 #include "wx/frame.h"
 
 #include "wx/object.h"
 #include "wx/frame.h"
 


@@ -22,13 +21,13 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxMiniFrame;
+class WXDLLIMPEXP_FWD_CORE wxMiniFrame;

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

-class wxMiniFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame

 {
     DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 
 {
     DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 


@@ -39,7 +38,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 = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION,

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


@@ -50,15 +49,18 @@ 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 = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION,

             const wxString& name = wxFrameNameStr);
 
             const wxString& name = wxFrameNameStr);
 

+    virtual void SetTitle( const wxString &title );

  // implementation
  // implementation

- 
+

     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;
 };
 

+#endif
+

 #endif
   //  __GTKMINIFRAMEH__
 #endif
   //  __GTKMINIFRAMEH__