Rebake from clean wx tree.

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

diff --git a/include/wx/x11/minifram.h b/include/wx/x11/minifram.h
index 49179b56743bd5269af9c2bdca26b4a00a135b6b..551a5813a2ad50bb7b5a56df289c6c7db711ebd8 100644 (file)
--- a/include/wx/x11/minifram.h
+++ b/include/wx/x11/minifram.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        minifram.h
+// Name:        wx/x11/minifram.h

 // Purpose:     wxMiniFrame class. A small frame for e.g. floating toolbars.
 //              If there is no equivalent on your platform, just make it a
 //              normal frame.
 // Purpose:     wxMiniFrame class. A small frame for e.g. floating toolbars.
 //              If there is no equivalent on your platform, just make it a
 //              normal frame.


@@ -8,22 +8,18 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_
 #define _WX_MINIFRAM_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_
 #define _WX_MINIFRAM_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "minifram.h"
-#endif
-

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

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

     DECLARE_DYNAMIC_CLASS(wxMiniFrame)
     DECLARE_DYNAMIC_CLASS(wxMiniFrame)

-        
+

 public:
     inline wxMiniFrame() {}
     inline wxMiniFrame(wxWindow *parent,
 public:
     inline wxMiniFrame() {}
     inline wxMiniFrame(wxWindow *parent,


@@ -37,10 +33,10 @@ public:
         // Use wxFrame constructor in absence of more specific code.
         Create(parent, id, title, pos, size, style, name);
     }
         // Use wxFrame constructor in absence of more specific code.
         Create(parent, id, title, pos, size, style, name);
     }

-    
-    ~wxMiniFrame() {}
+
+    virtual ~wxMiniFrame() {}

 protected:
 };
 
 #endif
 protected:
 };
 
 #endif

-// _WX_MINIFRAM_H_
+    // _WX_MINIFRAM_H_