Undoing my last checkin so wxGTK compiles correctly under unix.

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

diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index 1debcd008230d2ff00e1623d64db2805725aef28..9d1b228aac2fecbbd1a3e895112421299b4519ed 100644 (file)
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -18,6 +18,31 @@
 
 #include "wx/frame.h"
 
+#ifdef __WIN32__
+
+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,
+           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)
@@ -29,7 +54,7 @@ public:
            const wxString& title,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
+           long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION_HORIZ,
            const wxString& name = wxFrameNameStr)
   {
       Create(parent, id, title, pos, size, style, name);
@@ -42,5 +67,8 @@ public:
 protected:
 };
 
+#endif
+
+
 #endif
     // _WX_MINIFRAM_H_