X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7309b92dd71901b8c96dea3e48e57a6c21d072a4..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/include/wx/msw/minifram.h

diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index 9d1b228aac..d81a36656d 100644
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -1,74 +1,52 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        minifram.h
+// Name:        wx/msw/minifram.h
 // Purpose:     wxMiniFrame class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_
 #define _WX_MINIFRAM_H_
 
-#ifdef __GNUG__
-#pragma interface "minifram.h"
-#endif
-
 #include "wx/frame.h"
 
-#ifdef __WIN32__
-
-class WXDLLEXPORT wxMiniFrame: public wxFrame {
-
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
-
+class WXDLLIMPEXP_CORE wxMiniFrame : public wxFrame
+{
 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_STYLE,
-           const wxString& name = wxFrameNameStr)
+  wxMiniFrame() { }
+
+  bool Create(wxWindow *parent,
+              wxWindowID id,
+              const wxString& title,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
+              const wxString& name = wxFrameNameStr)
   {
-      Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT, name);
+      return wxFrame::Create(parent, id, title, pos, size,
+                             style |
+                             wxFRAME_TOOL_WINDOW |
+                             (parent ? wxFRAME_FLOAT_ON_PARENT : 0), name);
   }
 
-protected:
-};
-
-
-#else
-
-class WXDLLEXPORT wxMiniFrame: public wxFrame {
-
-  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_STYLE|wxTINY_CAPTION_HORIZ,
-           const wxString& name = wxFrameNameStr)
+  wxMiniFrame(wxWindow *parent,
+              wxWindowID id,
+              const wxString& title,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
+              const wxString& name = wxFrameNameStr)
   {
       Create(parent, id, title, pos, size, style, name);
   }
 
-  ~wxMiniFrame(void);
-
-  long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
 protected:
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame)
 };
 
-#endif
-
-
 #endif
     // _WX_MINIFRAM_H_