fixed a design flaw in wxFontMapper that prevented automatic creation of wxConfig...

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

diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index 4bd21f182d6d64eab8f8ab3c6c2870153317280e..116371e281381f01ae8eaa788e559eed63e0e2ae 100644 (file)
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxMiniFrame class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // 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__
+#ifndef _WX_MINIFRAM_H_
+#define _WX_MINIFRAM_H_

 
 #ifdef __GNUG__
 #pragma interface "minifram.h"
 
 #ifdef __GNUG__
 #pragma interface "minifram.h"


@@ -18,29 +18,53 @@
 
 #include "wx/frame.h"
 
 
 #include "wx/frame.h"
 

-class WXDLLEXPORT wxMiniFrame: public wxFrame {
+#ifdef __WIN32__

 
 

+class WXDLLEXPORT wxMiniFrame : public wxFrame
+{
+public:
+  wxMiniFrame() { }
+  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 | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT, name);
+  }
+
+protected:

   DECLARE_DYNAMIC_CLASS(wxMiniFrame)
   DECLARE_DYNAMIC_CLASS(wxMiniFrame)

+};

 
 

+
+#else // !Win32
+
+class WXDLLEXPORT wxMiniFrame : public wxFrame
+{

 public:
 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() { }
+  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)

   {
       Create(parent, id, title, pos, size, style, name);
   }
 
   {
       Create(parent, id, title, pos, size, style, name);
   }
 

-  ~wxMiniFrame(void);
+  virtual ~wxMiniFrame();

 
 

-  long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+  virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
 

-protected:
+  DECLARE_DYNAMIC_CLASS(wxMiniFrame)

 };
 
 };
 

+#endif // Win32/!Win32
+

 #endif
 #endif

-    // __MINIFRAMH__
+    // _WX_MINIFRAM_H_