Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index 7d8329fe4e4740c330f511e21538ec64097ef45a..5e12562ebc2b76da517b57495a9f61414ab25367 100644 (file)
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,13 +11,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 +26,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 +44,7 @@ public:
   }
 
 protected:
   }
 
 protected:

-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame)

 };
 
 #endif
 };
 
 #endif