changed wxPlatform implicit conversion to string to return const reference to wxStrin...

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

diff --git a/include/wx/motif/minifram.h b/include/wx/motif/minifram.h
index 07d9fff4417a16d4a4db7d7e9fc211f0b78c6db6..a649a04740a85f2821f86ef6e26cdeafb819681e 100644 (file)
--- a/include/wx/motif/minifram.h
+++ b/include/wx/motif/minifram.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        minifram.h
+// Name:        wx/motif/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,39 +8,35 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 
 class WXDLLEXPORT wxMiniFrame: public wxFrame {
 
 #include "wx/frame.h"
 
 class WXDLLEXPORT wxMiniFrame: public wxFrame {
 

-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+    DECLARE_DYNAMIC_CLASS(wxMiniFrame)

 
 public:
 
 public:

-  inline wxMiniFrame() {}
-  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)
-  {
-      // Use wxFrame constructor in absence of more specific code.
-      Create(parent, id, title, pos, size, style, name);
-  }
-
-  ~wxMiniFrame() {}
+    inline wxMiniFrame() {}
+    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)
+    {
+        // Use wxFrame constructor in absence of more specific code.
+        Create(parent, id, title, pos, size, style, name);
+    }
+
+    virtual ~wxMiniFrame() {}

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

-    // _WX_MINIFRAM_H_
+// _WX_MINIFRAM_H_