few other fixes for wxChar => wxString

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

diff --git a/interface/wx/toplevel.h b/interface/wx/toplevel.h
index 69aa5a6bf16125eb0f3e076dc3bcfc95e5722293..2c30dada11b2e335c6a8f5ba93e948e32d851400 100644 (file)
--- a/interface/wx/toplevel.h
+++ b/interface/wx/toplevel.h
@@ -84,7 +84,7 @@ public:
         (including GTK+) where the window manager may not support this operation
         and there is no way to find out.
     */
-    bool EnableCloseButton(bool enable = true);
+    virtual bool EnableCloseButton(bool enable = true);
 
     /**
         Returns a pointer to the button which is the default for this window, or
@@ -99,7 +99,7 @@ public:
 
         @see GetIcons()
     */
-    const wxIcon GetIcon() const;
+    wxIcon GetIcon() const;
 
     /**
         Returns all icons associated with the window, there will be none of them
@@ -108,14 +108,14 @@ public:
 
         @see wxIconBundle
     */
-    const wxIconBundle GetIcons() const;
+    const wxIconBundle& GetIcons() const;
 
     /**
         Gets a string containing the window title.
 
         @see SetTitle()
     */
-    wxString GetTitle() const;
+    virtual wxString GetTitle() const;
 
     /**
         Unique to the wxWinCE port. Responds to showing/hiding SIP (soft input
@@ -133,7 +133,7 @@ public:
 
         @see IsIconized(), Maximize(), wxIconizeEvent.
     */
-    void Iconize(bool iconize);
+    virtual void Iconize(bool iconize = true);
 
     /**
         Returns @true if this window is currently active, i.e. if the user is
@@ -153,17 +153,17 @@ public:
 
         @see ShowFullScreen()
     */
-    bool IsFullScreen();
+    virtual bool IsFullScreen() const;
 
     /**
         Returns @true if the window is iconized.
     */
-    bool IsIconized() const;
+    virtual bool IsIconized() const;
 
     /**
         Returns @true if the window is maximized.
     */
-    bool IsMaximized() const;
+    virtual bool IsMaximized() const;
 
     /**
         This method is specific to wxUniversal port.
@@ -184,7 +184,7 @@ public:
 
         @see Iconize()
     */
-    void Maximize(bool maximize);
+    virtual void Maximize(bool maximize = true);
 
     /**
         Use a system-dependent way to attract users attention to the window when
@@ -210,7 +210,7 @@ public:
 
         @see GetDefaultItem()
     */
-    void SetDefaultItem(wxWindow* win);
+    wxWindow* SetDefaultItem(wxWindow* win);
 
     /**
         Sets the icon for this window.
@@ -222,7 +222,9 @@ public:
                  reference counting, the copy is very quick. It is safe to
                  delete @a icon after calling this function.
 
-        @see wxIcon
+        @note In wxMSW, @a icon must be either 16x16 or 32x32 icon.
+
+        @see wxIcon, SetIcons()
     */
     void SetIcon(const wxIcon& icon);
 
@@ -235,7 +237,10 @@ public:
         @param icons
             The icons to associate with this window.
 
-        @see wxIconBundle.
+        @note In wxMSW, @a icons must contain a 16x16 or 32x32 icon,
+              preferably both.
+
+        @see wxIconBundle
     */
     virtual void SetIcons(const wxIconBundle& icons);
 
@@ -363,7 +368,7 @@ public:
             fully transparent, and a value of 255 sets the window to be fully
             opaque.
     */
-    virtual bool SetTransparent(int alpha);
+    virtual bool SetTransparent(wxByte alpha);
 
     /**
         This virtual function is not meant to be called directly but can be
@@ -394,7 +399,7 @@ public:
 
         @see IsFullScreen()
     */
-    bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
 
     /**
         This method is specific to wxUniversal port.