Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / minifram.h

diff --git a/interface/wx/minifram.h b/interface/wx/minifram.h
index 0d2d310d0d79f3e98a25519d04b528e0edeb65a3..3f4f80d1108f48e8e3d7e9d7a486e6408a813821 100644 (file)
--- a/interface/wx/minifram.h
+++ b/interface/wx/minifram.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxMiniFrame
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxMiniFrame
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -34,12 +34,8 @@
         Stay on top of other windows (Windows only).
     @style{wxSYSTEM_MENU}
         Displays a system menu (Windows and Motif only).
         Stay on top of other windows (Windows only).
     @style{wxSYSTEM_MENU}
         Displays a system menu (Windows and Motif only).

-    @style{wxTINY_CAPTION_HORIZ}
-        This style is obsolete and not used any longer.
-    @style{wxTINY_CAPTION_VERT}
-        This style is obsolete and not used any longer.

     @style{wxRESIZE_BORDER}
     @style{wxRESIZE_BORDER}

-        Displays a resizeable border around the window.
+        Displays a resizable border around the window.

     @endStyleTable
 
     @remarks
     @endStyleTable
 
     @remarks


@@ -92,7 +88,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCAPTION | wxRESIZE_BORDER,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCAPTION | wxRESIZE_BORDER,

-                const wxString& name = "frame");
+                const wxString& name = wxFrameNameStr);

 
     /**
         Destructor. Destroys all child windows and menu bar if present.
 
     /**
         Destructor. Destroys all child windows and menu bar if present.


@@ -103,11 +99,10 @@ public:
         Used in two-step frame construction.
         See wxMiniFrame() for further details.
     */
         Used in two-step frame construction.
         See wxMiniFrame() for further details.
     */

-    bool Create(wxWindow* parent, wxWindowID id,
-                const wxString& title,
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& title,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCAPTION | wxRESIZE_BORDER,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCAPTION | wxRESIZE_BORDER,

-                const wxString& name = "frame");
+                const wxString& name = wxFrameNameStr);

 };
 
 };