Allow wxThread::Wait() and Delete() to block, even under wxMSW.

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

diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index 7d8329fe4e4740c330f511e21538ec64097ef45a..d81a36656d4469903004df38a30c57c11c3c40e2 100644 (file)
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -12,13 +12,9 @@
 #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"
 

-class WXDLLEXPORT wxMiniFrame : public wxFrame
+class WXDLLIMPEXP_CORE wxMiniFrame : public wxFrame

 {
 public:
   wxMiniFrame() { }
 {
 public:
   wxMiniFrame() { }


@@ -31,10 +27,10 @@ public:
               long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
               const wxString& name = wxFrameNameStr)
   {
               long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
               const wxString& name = wxFrameNameStr)
   {

-      return Create(parent, id, title, pos, size,
-                    style |
-                    wxFRAME_TOOL_WINDOW |
-                    (parent ? wxFRAME_FLOAT_ON_PARENT : 0), name);
+      return wxFrame::Create(parent, id, title, pos, size,
+                             style |
+                             wxFRAME_TOOL_WINDOW |
+                             (parent ? wxFRAME_FLOAT_ON_PARENT : 0), name);

   }
 
   wxMiniFrame(wxWindow *parent,
   }
 
   wxMiniFrame(wxWindow *parent,


@@ -49,7 +45,7 @@ public:
   }
 
 protected:
   }
 
 protected:

-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame)

 };
 
 #endif
 };
 
 #endif