Fixes for 16-bit compilation

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

diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index 54d025e25511dda65172817b6ee16b61fdb3a0c9..9d1b228aac2fecbbd1a3e895112421299b4519ed 100644 (file)
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // 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,6 +18,8 @@
 
 #include "wx/frame.h"
 
 
 #include "wx/frame.h"
 

+#ifdef __WIN32__
+

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


@@ -25,11 +27,34 @@ class WXDLLEXPORT wxMiniFrame: public wxFrame {
 public:
   inline wxMiniFrame(void) {}
   inline wxMiniFrame(wxWindow *parent,
 public:
   inline wxMiniFrame(void) {}
   inline wxMiniFrame(wxWindow *parent,

-           const wxWindowID id,
+           wxWindowID id,

            const wxString& title,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& title,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
+           long style = wxDEFAULT_FRAME_STYLE,
+           const wxString& name = wxFrameNameStr)
+  {
+      Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT, 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)
   {
       Create(parent, id, title, pos, size, style, name);
            const wxString& name = wxFrameNameStr)
   {
       Create(parent, id, title, pos, size, style, name);


@@ -43,4 +68,7 @@ protected:
 };
 
 #endif
 };
 
 #endif

-    // __MINIFRAMH__
+
+
+#endif
+    // _WX_MINIFRAM_H_