other ifacecheck fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/buffer.h b/interface/wx/buffer.h
index 830330adfc62d6085bb58fd37792f3b8fd953e37..c94116f00156c7dd94fc9da9bb1372c465819911 100644 (file)
--- a/interface/wx/buffer.h
+++ b/interface/wx/buffer.h
@@ -34,7 +34,7 @@ public:
         @param size
             size of the new buffer.
     */
         @param size
             size of the new buffer.
     */

-    wxMemoryBuffer(size_t size);
+    wxMemoryBuffer(size_t size = DefBufSize);

 
     /**
         Append a single byte to the buffer.
 
     /**
         Append a single byte to the buffer.

diff --git a/interface/wx/image.h b/interface/wx/image.h
index 4ab6761c9e32a57bdb95df363f0f1688710cdf28..89a17138936fc5b08755de9a3622a78151d722d1 100644 (file)
--- a/interface/wx/image.h
+++ b/interface/wx/image.h
@@ -641,7 +641,7 @@ public:
         does have it, this pointer may be used to directly manipulate the alpha values
         which are stored as the RGB ones.
     */
         does have it, this pointer may be used to directly manipulate the alpha values
         which are stored as the RGB ones.
     */

-    const unsigned char * GetAlpha() const;
+    unsigned char* GetAlpha() const;

 
     /**
         Returns the blue intensity at the given coordinate.
 
     /**
         Returns the blue intensity at the given coordinate.


@@ -932,7 +932,9 @@ public:
 
         @see SaveFile()
     */
 
         @see SaveFile()
     */

-    bool LoadFile(wxInputStream& stream, wxBitmapType type, int index = -1);
+    virtual bool LoadFile(wxInputStream& stream,
+                          wxBitmapType type = wxBITMAP_TYPE_ANY,
+                          int index = -1);

 
     /**
         Loads an image from a file.
 
     /**
         Loads an image from a file.


@@ -1221,6 +1223,7 @@ public:
     */
     void SetAlpha(int x, int y, unsigned char alpha);
 
     */
     void SetAlpha(int x, int y, unsigned char alpha);
 

+    //@{

     /**
         Sets the image data without performing checks.
 
     /**
         Sets the image data without performing checks.
 


@@ -1235,7 +1238,10 @@ public:
         that will be responsible for deleting it.
         Do not pass to this function a pointer obtained through GetData().
     */
         that will be responsible for deleting it.
         Do not pass to this function a pointer obtained through GetData().
     */

-    void SetData(unsigned char* data);
+    void SetData(unsigned char* data, bool static_data = false);
+    void SetData(unsigned char* data, int new_width, int new_height,
+                 bool static_data = false);
+    //@}

 
     /**
         Specifies whether there is a mask or not.
 
     /**
         Specifies whether there is a mask or not.


@@ -1303,7 +1309,8 @@ public:
         This routine performs bounds-checks for the coordinate so it can be considered
         a safe way to manipulate the data.
     */
         This routine performs bounds-checks for the coordinate so it can be considered
         a safe way to manipulate the data.
     */

-    void SetRGB(wxRect& rect, unsigned char red,
+    void SetRGB(const wxRect& rect,
+                unsigned char red,

                 unsigned char green,
                 unsigned char blue);
 
                 unsigned char green,
                 unsigned char blue);
 

diff --git a/interface/wx/imaglist.h b/interface/wx/imaglist.h
index 76a8eaf5dbc0fd0fa91c209c154159a69538146b..e0b8a2d4fe67a8a1a9e88112c2fc03237067aab3 100644 (file)
--- a/interface/wx/imaglist.h
+++ b/interface/wx/imaglist.h
@@ -100,6 +100,8 @@ public:
                  bitmap will automatically be split into smaller images, each
                  matching the dimensions of the image list.
                  This does not apply when adding icons.
                  bitmap will automatically be split into smaller images, each
                  matching the dimensions of the image list.
                  This does not apply when adding icons.

+
+        @onlyfor{wxmsw,wxmac}

     */
     int Add(const wxIcon& icon);
 
     */
     int Add(const wxIcon& icon);
 


@@ -206,6 +208,8 @@ public:
 
         @remarks The original bitmap or icon is not affected by the Replace()
                  operation, and can be deleted afterwards.
 
         @remarks The original bitmap or icon is not affected by the Replace()
                  operation, and can be deleted afterwards.

+
+        @onlyfor{wxmsw,wxmac}

     */
     bool Replace(int index, const wxIcon& icon);
 };
     */
     bool Replace(int index, const wxIcon& icon);
 };

diff --git a/interface/wx/joystick.h b/interface/wx/joystick.h
index 70e5b807e790cdda19174cd61ae7b99d50ce9f9d..a75ba92148c6b65572c934a496aac2445258240f 100644 (file)
--- a/interface/wx/joystick.h
+++ b/interface/wx/joystick.h
@@ -48,7 +48,7 @@ public:
         @param id
             The button id to report, from 0 to GetNumberButtons() - 1
     */
         @param id
             The button id to report, from 0 to GetNumberButtons() - 1
     */

-    bool GetButtonState(unsigned id) const;
+    bool GetButtonState(unsigned int id) const;

 
     /**
         Returns the manufacturer id.
 
     /**
         Returns the manufacturer id.


@@ -114,7 +114,7 @@ public:
         @param axis
             The joystick axis to report, from 0 to GetNumberAxes() - 1.
     */
         @param axis
             The joystick axis to report, from 0 to GetNumberAxes() - 1.
     */

-    int GetPosition(unsigned axis) const;
+    int GetPosition(unsigned int axis) const;

 
     /**
         Returns the product id for the joystick.
 
     /**
         Returns the product id for the joystick.

diff --git a/interface/wx/kbdstate.h b/interface/wx/kbdstate.h
index 49162c98e3bbf8f26b74a416914ebca06a746556..45310d19c5f02cd2f2e51b9874725c8932dcde8b 100644 (file)
--- a/interface/wx/kbdstate.h
+++ b/interface/wx/kbdstate.h
@@ -30,14 +30,14 @@ public:
 
         By default, no modifiers are active.
      */
 
         By default, no modifiers are active.
      */

-    wxKeyboardState(bool controlDown,
-                    bool shiftDown,
-                    bool altDown,
-                    bool metaDown);
+    wxKeyboardState(bool controlDown = false,
+                    bool shiftDown = false,
+                    bool altDown = false,
+                    bool metaDown = false);

 
     /**
         Return the bit mask of all pressed modifier keys.
 
     /**
         Return the bit mask of all pressed modifier keys.

-        
+

         The return value is a combination of @c wxMOD_ALT, @c wxMOD_CONTROL,
         @c wxMOD_SHIFT and @c wxMOD_META bit masks. Additionally, @c wxMOD_NONE
         is defined as 0, i.e. corresponds to no modifiers (see HasModifiers())
         The return value is a combination of @c wxMOD_ALT, @c wxMOD_CONTROL,
         @c wxMOD_SHIFT and @c wxMOD_META bit masks. Additionally, @c wxMOD_NONE
         is defined as 0, i.e. corresponds to no modifiers (see HasModifiers())

diff --git a/interface/wx/listbook.h b/interface/wx/listbook.h
index eda83765d07caa21f821c51f244ab39af5928155..8ba18d5906ca602c178de292adfc2989dee6a81a 100644 (file)
--- a/interface/wx/listbook.h
+++ b/interface/wx/listbook.h
@@ -65,7 +65,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,

-               const wxString& name = wxEmptyStr);
+               const wxString& name = wxEmptyString);

 
     /**
         Returns the wxListView associated with the control.
 
     /**
         Returns the wxListView associated with the control.

diff --git a/interface/wx/listbox.h b/interface/wx/listbox.h
index 029a510b5a1410935d7991cd5f147d0b57265ed6..07f2540d83dc111ff42a254cee9b729b5fa6cdaa 100644 (file)
--- a/interface/wx/listbox.h
+++ b/interface/wx/listbox.h
@@ -199,7 +199,7 @@ public:
             Position before which to insert the items: if pos is 0 the
             items will be inserted in the beginning of the listbox
     */
             Position before which to insert the items: if pos is 0 the
             items will be inserted in the beginning of the listbox
     */

-    void InsertItems(int nItems, const wxString *items,
+    void InsertItems(unsigned int nItems, const wxString *items,

                      unsigned int pos);
 
     /**
                      unsigned int pos);
 
     /**


@@ -234,7 +234,7 @@ public:
         @param clientData
             Options array of client data pointers
     */
         @param clientData
             Options array of client data pointers
     */

-    void Set(int n, const wxString* choices, void **clientData = NULL);
+    void Set(unsigned int n, const wxString* choices, void *clientData);

 
     /**
         Clears the list box and adds the given strings to it.
 
     /**
         Clears the list box and adds the given strings to it.


@@ -246,7 +246,7 @@ public:
         @param clientData
             Options array of client data pointers
     */
         @param clientData
             Options array of client data pointers
     */

-    void Set(const wxArrayString& choices, void **clientData = NULL);
+    void Set(const wxArrayString& choices, void *clientData);

 
     /**
         Set the specified item to be the first visible item.
 
     /**
         Set the specified item to be the first visible item.

diff --git a/interface/wx/listctrl.h b/interface/wx/listctrl.h
index 69022eaebf41c5c30540e272684055003ac82f4e..d6ede9abb4e3ce1906b3765be47cf654356be372 100644 (file)
--- a/interface/wx/listctrl.h
+++ b/interface/wx/listctrl.h
@@ -273,7 +273,7 @@ public:
         Find an item whose data matches this data, starting from start or the
         beginning if 'start' is @c -1.
     */
         Find an item whose data matches this data, starting from start or the
         beginning if 'start' is @c -1.
     */

-    long FindItem(long start, long data);
+    long FindItem(long start, wxUIntPtr data);

 
     /**
         Find an item nearest this position in the specified direction,
 
     /**
         Find an item nearest this position in the specified direction,


@@ -923,7 +923,7 @@ public:
     /**
         Constructor.
     */
     /**
         Constructor.
     */

-    wxListEvent(wxEventType commandType = 0, int id = 0);
+    wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0);

 
     /**
         For @c EVT_LIST_CACHE_HINT event only: return the first item which the
 
     /**
         For @c EVT_LIST_CACHE_HINT event only: return the first item which the


@@ -1025,9 +1025,9 @@ public:
         Construct a wxListItemAttr with the specified foreground and
         background colors and font.
     */
         Construct a wxListItemAttr with the specified foreground and
         background colors and font.
     */

-    wxListItemAttr(const wxColour colText,
-                   const wxColour colBack,
-                   const wxFont font);
+    wxListItemAttr(const wxColour& colText,
+                   const wxColour& colBack,
+                   const wxFont& font);

 
     /**
         Returns the currently set background color.
 
     /**
         Returns the currently set background color.

diff --git a/interface/wx/log.h b/interface/wx/log.h
index ef8b2a9d8303606676d1ca36a3b861cb727f8619..97f022309825ea65c309f7446843db006e13ad8a 100644 (file)
--- a/interface/wx/log.h
+++ b/interface/wx/log.h
@@ -396,7 +396,7 @@ public:
         Constructs a log target which sends all the log messages to the given
         output stream. If it is @NULL, the messages are sent to @c cerr.
     */
         Constructs a log target which sends all the log messages to the given
         output stream. If it is @NULL, the messages are sent to @c cerr.
     */

-    wxLogStream(std::ostream ostr = NULL);
+    wxLogStream(std::ostream *ostr = NULL);

 };
 
 
 };
 
 

diff --git a/interface/wx/mediactrl.h b/interface/wx/mediactrl.h
index 263e6b42cb9631c85ffb32cefb6f352067671e2d..19e1dfeaa256965bff934722d539e96f8725dddb 100644 (file)
--- a/interface/wx/mediactrl.h
+++ b/interface/wx/mediactrl.h
@@ -250,11 +250,11 @@ public:
         @param name
             Window name.
     */
         @param name
             Window name.
     */

-    wxMediaCtrl(wxWindow* parent, wxWindowID id, const wxString& fileName = wxT(""),
+    wxMediaCtrl(wxWindow* parent, wxWindowID id, const wxString& fileName = wxEmptyString,

                 const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                 const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-                long style = 0, const wxString& szBackend = wxT(""),
+                long style = 0, const wxString& szBackend = wxEmptyString,

                 const wxValidator& validator = wxDefaultValidator,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = wxPanelNameStr);
+                const wxString& name = "mediaCtrl");

 
     /**
         Creates this control.
 
     /**
         Creates this control.


@@ -284,11 +284,11 @@ public:
         @param name
             Window name.
     */
         @param name
             Window name.
     */

-    bool Create(wxWindow* parent, wxWindowID id, const wxString& fileName = wxT(""),
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& fileName = wxEmptyString,

                 const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                 const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-                long style = 0, const wxString& szBackend = wxT(""),
+                long style = 0, const wxString& szBackend = wxEmptyString,

                 const wxValidator& validator = wxDefaultValidator,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = wxPanelNameStr);
+                const wxString& name = "mediaCtrl");

 
     /**
         Obtains the best size relative to the original/natural size of the
 
     /**
         Obtains the best size relative to the original/natural size of the

diff --git a/interface/wx/menu.h b/interface/wx/menu.h
index 3e17236f6809e4270644f838ef0ae8200dda9cd6..a90a802a0a991435843309b25821446446fc299d 100644 (file)
--- a/interface/wx/menu.h
+++ b/interface/wx/menu.h
@@ -102,7 +102,7 @@ public:
         @remarks Only use this when the menu bar has been associated with a
                  frame; otherwise, use the wxMenu equivalent call.
     */
         @remarks Only use this when the menu bar has been associated with a
                  frame; otherwise, use the wxMenu equivalent call.
     */

-    void Enable(int id, const bool enable);
+    void Enable(int id, bool enable);

 
     /**
         Enables or disables a whole menu.
 
     /**
         Enables or disables a whole menu.


@@ -451,7 +451,7 @@ public:
         @param style
             If set to wxMENU_TEAROFF, the menu will be detachable (wxGTK only).
     */
         @param style
             If set to wxMENU_TEAROFF, the menu will be detachable (wxGTK only).
     */

-    wxMenu(const wxString& title = "", long style = 0);
+    wxMenu(const wxString& title, long style = 0);

 
     /**
         Destructor, destroying the menu.
 
     /**
         Destructor, destroying the menu.


@@ -624,7 +624,7 @@ public:
 
         @see FindItem(), Destroy(), Remove()
     */
 
         @see FindItem(), Destroy(), Remove()
     */

-    void Delete(int id);
+    bool Delete(int id);

 
     /**
         Deletes the menu item from the menu. If the item is a submenu, it will
 
     /**
         Deletes the menu item from the menu. If the item is a submenu, it will


@@ -635,7 +635,7 @@ public:
 
         @see FindItem(), Destroy(), Remove()
     */
 
         @see FindItem(), Destroy(), Remove()
     */

-    void Delete(wxMenuItem* item);
+    bool Delete(wxMenuItem* item);

 
     /**
         Deletes the menu item from the menu. If the item is a submenu, it will
 
     /**
         Deletes the menu item from the menu. If the item is a submenu, it will


@@ -647,7 +647,7 @@ public:
 
         @see FindItem(), Deletes(), Remove()
     */
 
         @see FindItem(), Deletes(), Remove()
     */

-    void Destroy(int id);
+    bool Destroy(int id);

 
     /**
         Deletes the menu item from the menu. If the item is a submenu, it will
 
     /**
         Deletes the menu item from the menu. If the item is a submenu, it will


@@ -659,7 +659,7 @@ public:
 
         @see FindItem(), Deletes(), Remove()
     */
 
         @see FindItem(), Deletes(), Remove()
     */

-    void Destroy(wxMenuItem* item);
+    bool Destroy(wxMenuItem* item);

 
     /**
         Enables or disables (greys out) a menu item.
 
     /**
         Enables or disables (greys out) a menu item.


@@ -698,7 +698,7 @@ public:
 
         @return Menu item object or NULL if none is found.
     */
 
         @return Menu item object or NULL if none is found.
     */

-    const wxMenuItem* FindItem(int id, wxMenu** menu = NULL) const;
+    wxMenuItem* FindItem(int id, wxMenu** menu = NULL) const;

 
     /**
         Returns the wxMenuItem given a position in the menu.
 
     /**
         Returns the wxMenuItem given a position in the menu.


@@ -748,13 +748,16 @@ public:
     */
     size_t GetMenuItemCount() const;
 
     */
     size_t GetMenuItemCount() const;
 

+    //@{

     /**
         Returns the list of items in the menu.
 
         wxMenuItemList is a pseudo-template list class containing wxMenuItem
         pointers, see wxList.
     */
     /**
         Returns the list of items in the menu.
 
         wxMenuItemList is a pseudo-template list class containing wxMenuItem
         pointers, see wxList.
     */

-    wxMenuItemList GetMenuItems() const;
+    wxMenuItemList& GetMenuItems() const;
+    const wxMenuItemList& GetMenuItems() const;
+    //@}

 
     /**
         Returns the title of the menu.
 
     /**
         Returns the title of the menu.


@@ -785,8 +788,8 @@ public:
         @see Append(), Prepend()
     */
     wxMenuItem* Insert(size_t pos, int id,
         @see Append(), Prepend()
     */
     wxMenuItem* Insert(size_t pos, int id,

-                       const wxString& item = "",
-                       const wxString& helpString = "",
+                       const wxString& item = wxEmptyString,
+                       const wxString& helpString = wxEmptyString,

                        wxItemKind kind = wxITEM_NORMAL);
 
     /**
                        wxItemKind kind = wxITEM_NORMAL);
 
     /**


@@ -850,8 +853,8 @@ public:
 
         @see Append(), Insert()
     */
 
         @see Append(), Insert()
     */

-    wxMenuItem* Prepend(int id, const wxString& item = "",
-                        const wxString& helpString = "",
+    wxMenuItem* Prepend(int id, const wxString& item = wxEmptyString,
+                        const wxString& helpString = wxEmptyString,

                         wxItemKind kind = wxITEM_NORMAL);
 
     /**
                         wxItemKind kind = wxITEM_NORMAL);
 
     /**

diff --git a/interface/wx/menuitem.h b/interface/wx/menuitem.h
index 93f66572eecb9c1ec379c7fa5c901fcfa1514910..e74e7bde17237a243dcb58c869565db4ff58ea66 100644 (file)
--- a/interface/wx/menuitem.h
+++ b/interface/wx/menuitem.h
@@ -80,8 +80,8 @@ public:
             If non-@NULL, indicates that the menu item is a submenu.
     */
     wxMenuItem(wxMenu* parentMenu = NULL, int id = wxID_SEPARATOR,
             If non-@NULL, indicates that the menu item is a submenu.
     */
     wxMenuItem(wxMenu* parentMenu = NULL, int id = wxID_SEPARATOR,

-               const wxString& text = "",
-               const wxString& helpString = "",
+               const wxString& text = wxEmptyString,
+               const wxString& helpString = wxEmptyString,

                wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);
 
                wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);
 

diff --git a/interface/wx/msgdlg.h b/interface/wx/msgdlg.h
index 88243d4bec86762b601b7769f8753dbb334e4bef..781ec79cf9ef3ede8a33dde296139f64b58b3566 100644 (file)
--- a/interface/wx/msgdlg.h
+++ b/interface/wx/msgdlg.h
@@ -82,7 +82,7 @@ public:
             Dialog position (ignored under MSW).
     */
     wxMessageDialog(wxWindow* parent, const wxString& message,
             Dialog position (ignored under MSW).
     */
     wxMessageDialog(wxWindow* parent, const wxString& message,

-                    const wxString& caption = "Message box",
+                    const wxString& caption = wxMessageBoxCaptionStr,

                     long style = wxOK | wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 
                     long style = wxOK | wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 

diff --git a/interface/wx/mstream.h b/interface/wx/mstream.h
index c6c2eacd6cb032cb6f08af0e3d64ceeecadfff84..eec704124a2f14b2f50ef831358851be659a09ff 100644 (file)
--- a/interface/wx/mstream.h
+++ b/interface/wx/mstream.h
@@ -66,7 +66,7 @@ public:
         buffer data of length len. The stream does not take ownership of the buffer,
         i.e. the buffer will not be deleted in its destructor.
     */
         buffer data of length len. The stream does not take ownership of the buffer,
         i.e. the buffer will not be deleted in its destructor.
     */

-    wxMemoryInputStream(const char* data, size_t len);
+    wxMemoryInputStream(const void* data, size_t len);

 
     /**
         Creates a new read-only memory stream, initializing it with the data from
 
     /**
         Creates a new read-only memory stream, initializing it with the data from

diff --git a/interface/wx/panel.h b/interface/wx/panel.h
index cd76e4bee936633694c47af89786377264a15a06..59acc6534a106a5606054504f2baf696b760008f 100644 (file)
--- a/interface/wx/panel.h
+++ b/interface/wx/panel.h
@@ -64,7 +64,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL,

-            const wxString& name = "panel");
+            const wxString& name = wxPanelNameStr);

 
     /**
         Destructor. Deletes any child windows before deleting the physical window.
 
     /**
         Destructor. Deletes any child windows before deleting the physical window.

diff --git a/interface/wx/pen.h b/interface/wx/pen.h
index 38a652feed18b7225d9decfccc309d0f35125171..4c5fb7eb7b9bce9ff57c1ad3ec5948f3d91c0e3a 100644 (file)
--- a/interface/wx/pen.h
+++ b/interface/wx/pen.h
@@ -179,6 +179,8 @@ public:
         @param stipple
             A stipple bitmap.
 
         @param stipple
             A stipple bitmap.
 

+        @onlyfor{wxmsw,wxmac}
+

         @see SetWidth(), SetStipple()
     */
     wxPen(const wxBitmap& stipple, int width);
         @see SetWidth(), SetStipple()
     */
     wxPen(const wxBitmap& stipple, int width);

diff --git a/interface/wx/socket.h b/interface/wx/socket.h
index 3a7adebb306d1fdb2e18db13d20ced933840cfcf..0c7b0eceaee9ddb7a3b1f2a3d9c8aae03e16b16c 100644 (file)
--- a/interface/wx/socket.h
+++ b/interface/wx/socket.h
@@ -70,12 +70,12 @@ public:
 
         @return @true on success, @false if something goes wrong (invalid @a service).
     */
 
         @return @true on success, @false if something goes wrong (invalid @a service).
     */

-    bool Service(unsigned short service);
+    bool Service(unsigned short service) = 0;

 
     /**
         Returns the current service.
     */
 
     /**
         Returns the current service.
     */

-    unsigned short Service();
+    unsigned short Service() const = 0;

 };
 
 
 };
 
 


@@ -262,7 +262,7 @@ public:
     /**
         Returns the current service.
     */
     /**
         Returns the current service.
     */

-    virtual unsigned short Service();
+    virtual unsigned short Service() const;

 };
 
 
 };
 
 

diff --git a/interface/wx/strconv.h b/interface/wx/strconv.h
index 9a40c5cdec70dae425c0d035cfc57bb9d7e9ee5a..22e9de28508c7253641fc525945db9e088cb7864 100644 (file)
--- a/interface/wx/strconv.h
+++ b/interface/wx/strconv.h
@@ -174,8 +174,8 @@ public:
         compatibility concerns).
     */
     const wxWCharBuffer cMB2WC(const char* in,
         compatibility concerns).
     */
     const wxWCharBuffer cMB2WC(const char* in,

-                               size_t inLen = wxNO_LEN,
-                               size_t *outLen = NULL) const;
+                               size_t inLen,
+                               size_t *outLen) const;

 
     //@{
     /**
 
     //@{
     /**


@@ -201,8 +201,8 @@ public:
         FromWChar(), please see the description of cMB2WC() for more details.
     */
     const wxCharBuffer cWC2MB(const wchar_t* in,
         FromWChar(), please see the description of cMB2WC() for more details.
     */
     const wxCharBuffer cWC2MB(const wchar_t* in,

-                              size_t inLen = wxNO_LEN,
-                              size_t *outLen = NULL) const;
+                              size_t inLen,
+                              size_t *outLen) const;

 
     //@{
     /**
 
     //@{
     /**

diff --git a/interface/wx/stream.h b/interface/wx/stream.h
index 88d260410367dd021534edc6b44338db1cf44aad..6de6fa871c4d65d5f23cb4848416562a438998eb 100644 (file)
--- a/interface/wx/stream.h
+++ b/interface/wx/stream.h
@@ -463,14 +463,14 @@ public:
         This function returns a reference on the current object, so the user can
         test any states of the stream right away.
     */
         This function returns a reference on the current object, so the user can
         test any states of the stream right away.
     */

-    wxOutputStream Write(const void* buffer, size_t size);
+    wxOutputStream& Write(const void* buffer, size_t size);

 
     /**
         Reads data from the specified input stream and stores them
         in the current stream. The data is read until an error is raised
         by one of the two streams.
     */
 
     /**
         Reads data from the specified input stream and stores them
         in the current stream. The data is read until an error is raised
         by one of the two streams.
     */

-    wxOutputStream Write(wxInputStream& stream_in);
+    wxOutputStream& Write(wxInputStream& stream_in);

 };
 
 
 };
 
 


@@ -817,7 +817,7 @@ public:
         @return This function returns a reference on the current object, so the
                 user can test any states of the stream right away.
     */
         @return This function returns a reference on the current object, so the
                 user can test any states of the stream right away.
     */

-    wxInputStream Read(void* buffer, size_t size);
+    virtual wxInputStream& Read(void* buffer, size_t size);

 
     /**
         Reads data from the input queue and stores it in the specified output stream.
 
     /**
         Reads data from the input queue and stores it in the specified output stream.


@@ -861,13 +861,13 @@ public:
 
         @return Returns the amount of bytes saved in the Write-Back buffer.
     */
 
         @return Returns the amount of bytes saved in the Write-Back buffer.
     */

-    size_t Ungetch(const char* buffer, size_t size);
+    size_t Ungetch(const void* buffer, size_t size);

 
     /**
         This function acts like the previous one except that it takes only one
         character: it is sometimes shorter to use than the generic function.
     */
 
     /**
         This function acts like the previous one except that it takes only one
         character: it is sometimes shorter to use than the generic function.
     */

-    Return value bool Ungetch(char c);
+    bool Ungetch(char c);

 };
 
 
 };