Small speed up to fonts and support for scaling.

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

diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index 9d1b228aac2fecbbd1a3e895112421299b4519ed..1e34b5d88d821b14496651251af428104743cc0c 100644 (file)
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // 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_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_


@@ -20,55 +20,54 @@
 
 #ifdef __WIN32__
 
 
 #ifdef __WIN32__
 

-class WXDLLEXPORT wxMiniFrame: public wxFrame {
-
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
-
+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_STYLE,
-           const wxString& name = wxFrameNameStr)
+  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);
+      Create(parent, id, title, pos, size,
+             style |
+             wxFRAME_TOOL_WINDOW |
+             (parent ? wxFRAME_FLOAT_ON_PARENT : 0), name);

   }
 
 protected:
   }
 
 protected:

+  DECLARE_DYNAMIC_CLASS(wxMiniFrame)

 };
 
 
 };
 
 

-#else
-
-class WXDLLEXPORT wxMiniFrame: public wxFrame {
-
-  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_STYLE|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
-
+#endif // Win32/!Win32

 
 #endif
     // _WX_MINIFRAM_H_
 
 #endif
     // _WX_MINIFRAM_H_