Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/minifram.h b/include/wx/os2/minifram.h
index 8f1644d5583ac7dc529ca482d60fa0b94bb0b1eb..c7f705450ec704c0d3309110655731ae5f787f81 100644 (file)
--- a/include/wx/os2/minifram.h
+++ b/include/wx/os2/minifram.h
@@ -1,46 +1,41 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        minifram.h
+// Name:        wx/os2/minifram.h
 // Purpose:     wxMiniFrame class. A small frame for e.g. floating toolbars.
 //              If there is no equivalent on your platform, just make it a
 //              normal frame.
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/10/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_
 #define _WX_MINIFRAM_H_
 
-#ifdef __GNUG__
-#pragma interface "minifram.h"
-#endif
-
 #include "wx/frame.h"
 
-class WXDLLEXPORT wxMiniFrame: public wxFrame {
+class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame {
 
   DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 
 public:
-  inline wxMiniFrame() {}
+  inline wxMiniFrame(void) {}
   inline wxMiniFrame(wxWindow *parent,
            wxWindowID id,
            const wxString& title,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION_HORIZ,
+           long style = wxDEFAULT_FRAME_STYLE,
            const wxString& name = wxFrameNameStr)
   {
-      // Use wxFrame constructor in absence of more specific code.
-      Create(parent, id, title, pos, size, style, name);
+      Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT, name);
   }
 
-  ~wxMiniFrame() {}
 protected:
 };
 
 #endif
     // _WX_MINIFRAM_H_
+