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 c11b24e602c01f1d58193e3b2f0ac983779dcdb2..3f4f80d1108f48e8e3d7e9d7a486e6408a813821 100644 (file)
--- a/interface/wx/minifram.h
+++ b/interface/wx/minifram.h
@@ -3,48 +3,46 @@
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxMiniFrame
 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxMiniFrame

-    @wxheader{minifram.h}

 
 

-    A miniframe is a frame with a small title bar. It is suitable for floating
-    toolbars that must not
-    take up too much screen area.
+    A miniframe is a frame with a small title bar.
+    It is suitable for floating toolbars that must not take up too much screen area.

 
 

-    An example of mini frame can be seen in the @ref overview_sampledialogs
-    "dialogs sample"
+    An example of mini frame can be seen in the @ref page_samples_dialogs

     using the "Mini frame" command of the "Generic dialogs" submenu.
 
     @beginStyleTable
     @style{wxICONIZE}
     using the "Mini frame" command of the "Generic dialogs" submenu.
 
     @beginStyleTable
     @style{wxICONIZE}

-           Display the frame iconized (minimized) (Windows only).
+        Display the frame iconized (minimized) (Windows only).

     @style{wxCAPTION}
     @style{wxCAPTION}

-           Puts a caption on the frame.
+        Puts a caption on the frame.

     @style{wxMINIMIZE}
     @style{wxMINIMIZE}

-           Identical to wxICONIZE.
+        Identical to wxICONIZE.

     @style{wxMINIMIZE_BOX}
     @style{wxMINIMIZE_BOX}

-           Displays a minimize box on the frame (Windows and Motif only).
+        Displays a minimize box on the frame (Windows and Motif only).

     @style{wxMAXIMIZE}
     @style{wxMAXIMIZE}

-           Displays the frame maximized (Windows only).
+        Displays the frame maximized (Windows only).

     @style{wxMAXIMIZE_BOX}
     @style{wxMAXIMIZE_BOX}

-           Displays a maximize box on the frame (Windows and Motif only).
+        Displays a maximize box on the frame (Windows and Motif only).

     @style{wxCLOSE_BOX}
     @style{wxCLOSE_BOX}

-           Displays a close box on the frame.
+        Displays a close box on the frame.

     @style{wxSTAY_ON_TOP}
     @style{wxSTAY_ON_TOP}

-           Stay on top of other windows (Windows only).
+        Stay on top of other windows (Windows only).

     @style{wxSYSTEM_MENU}
     @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.
+        Displays a system menu (Windows and Motif only).

     @style{wxRESIZE_BORDER}
     @style{wxRESIZE_BORDER}

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

     @endStyleTable
 
     @endStyleTable
 

+    @remarks
+    This class has miniframe functionality under Windows and GTK, i.e. the presence
+    of mini frame will not be noted in the task bar and focus behaviour is different.
+    On other platforms, it behaves like a normal frame.
+

     @library{wxcore}
     @category{managedwnd}
 
     @library{wxcore}
     @category{managedwnd}
 


@@ -53,7 +51,11 @@
 class wxMiniFrame : public wxFrame
 {
 public:
 class wxMiniFrame : public wxFrame
 {
 public:

-    //@{
+    /**
+        Default ctor.
+    */
+    wxMiniFrame();
+

     /**
         Constructor, creating the window.
 
     /**
         Constructor, creating the window.
 


@@ -61,52 +63,46 @@ public:
             The window parent. This may be @NULL. If it is non-@NULL, the frame will
             always be displayed on top of the parent window on Windows.
         @param id
             The window parent. This may be @NULL. If it is non-@NULL, the frame will
             always be displayed on top of the parent window on Windows.
         @param id

-            The window identifier. It may take a value of -1 to indicate a default
-        value.
+            The window identifier. It may take a value of -1 to indicate a default value.

         @param title
             The caption to be displayed on the frame's title bar.
         @param pos
             The window position. The value wxDefaultPosition indicates a default position,
         @param title
             The caption to be displayed on the frame's title bar.
         @param pos
             The window position. The value wxDefaultPosition indicates a default position,

-        chosen by
-            either the windowing system or wxWidgets, depending on platform.
+            chosen by  either the windowing system or wxWidgets, depending on platform.

         @param size
             The window size. The value wxDefaultSize indicates a default size, chosen by
             either the windowing system or wxWidgets, depending on platform.
         @param style
             The window style. See wxMiniFrame.
         @param name
         @param size
             The window size. The value wxDefaultSize indicates a default size, chosen by
             either the windowing system or wxWidgets, depending on platform.
         @param style
             The window style. See wxMiniFrame.
         @param name

-            The name of the window. This parameter is used to associate a name with the
-        item,
-            allowing the application user to set Motif resource values for
+            The name of the window. This parameter is used to associate a name with
+            the item, allowing the application user to set Motif resource values for

             individual windows.
 
         @remarks The frame behaves like a normal frame on non-Windows platforms.
 
         @see Create()
     */
             individual windows.
 
         @remarks The frame behaves like a normal frame on non-Windows platforms.
 
         @see Create()
     */

-    wxMiniFrame();

     wxMiniFrame(wxWindow* parent, wxWindowID id,
                 const wxString& title,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCAPTION | wxRESIZE_BORDER,
     wxMiniFrame(wxWindow* parent, wxWindowID id,
                 const wxString& title,
                 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.
     */

-    ~wxMiniFrame();
+    virtual ~wxMiniFrame();

 
     /**
 
     /**

-        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);

 };
 
 };