avoid warnings about missing macro parameters (only given by VC6 apparently) when...

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

diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index 116371e281381f01ae8eaa788e559eed63e0e2ae..7b43537fad8a40d80f6bb28a2894fd5badc72aad 100644 (file)
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -12,19 +12,14 @@
 #ifndef _WX_MINIFRAM_H_
 #define _WX_MINIFRAM_H_
 
 #ifndef _WX_MINIFRAM_H_
 #define _WX_MINIFRAM_H_
 

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

 #include "wx/frame.h"
 
 #include "wx/frame.h"
 

-#ifdef __WIN32__
-

 class WXDLLEXPORT wxMiniFrame : public wxFrame
 {
 public:
   wxMiniFrame() { }
 class WXDLLEXPORT wxMiniFrame : public wxFrame
 {
 public:
   wxMiniFrame() { }

-  wxMiniFrame(wxWindow *parent,
+
+  bool Create(wxWindow *parent,

               wxWindowID id,
               const wxString& title,
               const wxPoint& pos = wxDefaultPosition,
               wxWindowID id,
               const wxString& title,
               const wxPoint& pos = wxDefaultPosition,


@@ -32,39 +27,26 @@ public:
               long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
               const wxString& name = wxFrameNameStr)
   {
               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:
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
-};
-
-
-#else // !Win32
-
-class WXDLLEXPORT wxMiniFrame : public wxFrame
-{
-public:
-  wxMiniFrame() { }

   wxMiniFrame(wxWindow *parent,
               wxWindowID id,
               const wxString& title,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
   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 = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,

               const wxString& name = wxFrameNameStr)
   {
       Create(parent, id, title, pos, size, style, name);
   }
 
               const wxString& name = wxFrameNameStr)
   {
       Create(parent, id, title, pos, size, style, name);
   }
 

-  virtual ~wxMiniFrame();
-
-  virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+protected:
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame)

 };
 
 };
 

-#endif // Win32/!Win32
-

 #endif
     // _WX_MINIFRAM_H_
 #endif
     // _WX_MINIFRAM_H_