Add an empty implementation of the OSXGenerateEvent() pure virtual so the generic...

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

diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index 4bd21f182d6d64eab8f8ab3c6c2870153317280e..d81a36656d4469903004df38a30c57c11c3c40e2 100644 (file)
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -1,46 +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 and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MINIFRAMH__
-#define __MINIFRAMH__
-
-#ifdef __GNUG__
-#pragma interface "minifram.h"
-#endif
+#ifndef _WX_MINIFRAM_H_
+#define _WX_MINIFRAM_H_
 
 #include "wx/frame.h"
 
-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|wxTINY_CAPTION_HORIZ,
-           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, name);
+      return wxFrame::Create(parent, id, title, pos, size,
+                             style |
+                             wxFRAME_TOOL_WINDOW |
+                             (parent ? wxFRAME_FLOAT_ON_PARENT : 0), name);
   }
 
-  ~wxMiniFrame(void);
-
-  long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+  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);
+  }
 
 protected:
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame)
 };
 
 #endif
-    // __MINIFRAMH__
+    // _WX_MINIFRAM_H_