From 43c48e1e53d74cef62d15f08f015d9efeb45a0c1 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Tue, 28 Oct 2008 15:36:26 +0000 Subject: [PATCH] automated ifacecheck fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/combobox.h | 2 +- interface/wx/datectrl.h | 2 +- interface/wx/dcsvg.h | 2 +- interface/wx/dialog.h | 2 +- interface/wx/editlbox.h | 5 ++--- interface/wx/event.h | 4 ++-- interface/wx/fdrepdlg.h | 4 ++-- interface/wx/ffile.h | 2 +- interface/wx/filectrl.h | 11 +++++----- interface/wx/filepicker.h | 10 ++++----- interface/wx/filesys.h | 4 ++-- interface/wx/fontenum.h | 2 +- interface/wx/frame.h | 18 +++++++-------- interface/wx/gauge.h | 5 ++--- interface/wx/hyperlink.h | 8 +++---- interface/wx/icon.h | 2 +- interface/wx/iconbndl.h | 2 +- interface/wx/intl.h | 2 +- interface/wx/laywin.h | 4 ++-- interface/wx/log.h | 8 +++---- interface/wx/mediactrl.h | 8 +++---- interface/wx/memory.h | 2 +- interface/wx/menu.h | 44 ++++++++++++++++++------------------- interface/wx/menuitem.h | 10 ++++----- interface/wx/mimetype.h | 5 +++-- interface/wx/minifram.h | 5 ++--- interface/wx/msgdlg.h | 4 ++-- interface/wx/palette.h | 5 ++--- interface/wx/panel.h | 2 +- interface/wx/pen.h | 6 ++--- interface/wx/print.h | 6 ++--- interface/wx/printdlg.h | 2 +- interface/wx/progdlg.h | 3 +-- interface/wx/propdlg.h | 5 ++--- interface/wx/protocol/ftp.h | 6 ++--- interface/wx/quantize.h | 6 ++--- interface/wx/radiobox.h | 4 ++-- interface/wx/radiobut.h | 10 ++++----- interface/wx/region.h | 2 +- interface/wx/renderer.h | 13 +++++------ interface/wx/scrolbar.h | 5 ++--- interface/wx/slider.h | 10 ++++----- interface/wx/spinctrl.h | 7 +++--- interface/wx/statbmp.h | 8 +++---- interface/wx/stattext.h | 8 +++---- interface/wx/statusbr.h | 8 +++---- interface/wx/stc/stc.h | 16 +++++++------- interface/wx/stdpaths.h | 4 ++-- interface/wx/taskbar.h | 3 ++- interface/wx/textctrl.h | 33 ++++++++++++++-------------- interface/wx/textfile.h | 18 +++++++-------- interface/wx/tokenzr.h | 2 +- interface/wx/toolbar.h | 30 ++++++++++++------------- interface/wx/valgen.h | 2 +- interface/wx/valtext.h | 2 +- 55 files changed, 190 insertions(+), 213 deletions(-) diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h index a13a5838e0..c04b81de47 100644 --- a/interface/wx/combobox.h +++ b/interface/wx/combobox.h @@ -234,7 +234,7 @@ public: /** Returns the last position in the combobox text field. */ - virtual wxTextPos GetLastPosition() const; + virtual long GetLastPosition() const; /** This is the same as wxTextCtrl::GetSelection() for the text control diff --git a/interface/wx/datectrl.h b/interface/wx/datectrl.h index 0cf709411d..90d457a220 100644 --- a/interface/wx/datectrl.h +++ b/interface/wx/datectrl.h @@ -133,7 +133,7 @@ public: @remarks If the format parameter is invalid, the behaviour is undefined. */ - void SetFormat(const wxChar* format); + bool SetFormat(const wxString& format); /** Sets the valid range for the date selection. If @a dt1 is valid, it diff --git a/interface/wx/dcsvg.h b/interface/wx/dcsvg.h index 17f92831cb..065e2f87e9 100644 --- a/interface/wx/dcsvg.h +++ b/interface/wx/dcsvg.h @@ -461,7 +461,7 @@ public: @see SetUserScale() */ - void GetUserScale(double x, double y); + void GetUserScale(double* x, double* y) const; /** Converts logical X coordinate to device coordinate, using the current diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h index f053d885be..0c4140b2b9 100644 --- a/interface/wx/dialog.h +++ b/interface/wx/dialog.h @@ -377,7 +377,7 @@ public: Iconize(@false) will bring the window to the front, as does Show(@true). */ - void Iconize(bool iconize); + virtual void Iconize(bool iconize = true); /** Returns @true if the dialog box is iconized. Windows only. diff --git a/interface/wx/editlbox.h b/interface/wx/editlbox.h index 024b1aabe2..d1d1bd57d9 100644 --- a/interface/wx/editlbox.h +++ b/interface/wx/editlbox.h @@ -77,12 +77,11 @@ public: Creates the editable listbox for two-step construction. See wxEditableListBox() for further details. */ - bool Create(wxWindow* parent, wxWindowID id, - const wxString& label, + bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxEL_DEFAULT_STYLE, - const wxString& name = "editableListBox"); + const wxString& name = wxEditableListBoxNameStr); /** Replaces current contents with given strings. diff --git a/interface/wx/event.h b/interface/wx/event.h index 4c3ac98ffe..7b78100d4a 100644 --- a/interface/wx/event.h +++ b/interface/wx/event.h @@ -2399,7 +2399,7 @@ public: @see SetOrigin() */ - wxHelpEventOrigin GetOrigin() const; + wxHelpEvent::Origin GetOrigin() const; /** Returns the left-click position of the mouse, in screen coordinates. @@ -2412,7 +2412,7 @@ public: @see GetOrigin() */ - void SetOrigin(wxHelpEventOrigin); + void SetOrigin(wxHelpEvent::Origin origin); /** Sets the left-click position of the mouse, in screen coordinates. diff --git a/interface/wx/fdrepdlg.h b/interface/wx/fdrepdlg.h index f011ee982b..997e5330ba 100644 --- a/interface/wx/fdrepdlg.h +++ b/interface/wx/fdrepdlg.h @@ -124,7 +124,7 @@ public: /** Get the string to find. */ - const wxString GetFindString(); + const wxString& GetFindString(); /** Get the combination of @c wxFindReplaceFlags values. @@ -134,7 +134,7 @@ public: /** Get the replacement string. */ - const wxString GetReplaceString(); + const wxString& GetReplaceString(); /** Set the string to find (used as initial value by the dialog). diff --git a/interface/wx/ffile.h b/interface/wx/ffile.h index f5d1f37871..33de5504c4 100644 --- a/interface/wx/ffile.h +++ b/interface/wx/ffile.h @@ -90,7 +90,7 @@ public: The descriptor should be already opened and it will be closed by wxFFile object. */ - void Attach(FILE* fp); + void Attach(FILE* fp, const wxString& name = wxEmptyString); /** Closes the file and returns @true on success. diff --git a/interface/wx/filectrl.h b/interface/wx/filectrl.h index 82d27969ce..72149989d5 100644 --- a/interface/wx/filectrl.h +++ b/interface/wx/filectrl.h @@ -96,11 +96,10 @@ public: bool Create(wxWindow* parent, wxWindowID id, const wxString& defaultDirectory = wxEmptyString, const wxString& defaultFilename = wxEmptyString, - const wxPoint& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFC_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, + const wxString& wildCard = wxFileSelectorDefaultWildcardStr, + long style = wxFC_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - const wxString& name = "filectrl"); + const wxString& name = wxFileCtrlNameStr); /** Returns the current directory of the file control (i.e. the directory shown by it). @@ -178,7 +177,7 @@ public: /** Sets whether hidden files and folders are shown or not. */ - void ShowHidden(const bool show); + virtual void ShowHidden(bool show); }; @@ -233,7 +232,7 @@ public: /** Sets the files changed by this event. */ - void SetFiles(const wxArrayString files); + void SetFiles(const wxArrayString& files); /** diff --git a/interface/wx/filepicker.h b/interface/wx/filepicker.h index 4e0b9156e4..e7be724a10 100644 --- a/interface/wx/filepicker.h +++ b/interface/wx/filepicker.h @@ -102,13 +102,13 @@ public: */ bool Create(wxWindow* parent, wxWindowID id, const wxString& path = wxEmptyString, - const wxString& message = "Select a file", - const wxString& wildcard = ".", + const wxString& message = wxFileSelectorPromptStr, + const wxString& wildcard = wxFileSelectorDefaultWildcardStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxFLP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "filepickerctrl"); + const wxString& name = wxFilePickerCtrlNameStr); /** Similar to GetPath() but returns the path of the currently selected @@ -222,12 +222,12 @@ public: */ bool Create(wxWindow* parent, wxWindowID id, const wxString& path = wxEmptyString, - const wxString& message = "Select a folder", + const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "dirpickerctrl"); + const wxString& name = wxDirPickerCtrlNameStr); /** Returns the absolute path of the currently selected directory as a diff --git a/interface/wx/filesys.h b/interface/wx/filesys.h index 6e9709d8dd..c872dbafc8 100644 --- a/interface/wx/filesys.h +++ b/interface/wx/filesys.h @@ -107,7 +107,7 @@ public: @param file the name of the file to look for */ - bool FindFileInPath(wxString str, const wxString& path, + bool FindFileInPath(wxString* pStr, const wxString& path, const wxString& file); /** @@ -238,7 +238,7 @@ public: You will have to delete the stream yourself. */ - void DetachStream(); + wxInputStream* DetachStream(); /** Returns anchor (if present). The term of @b anchor can be easily diff --git a/interface/wx/fontenum.h b/interface/wx/fontenum.h index 99327a7311..ad31d2e524 100644 --- a/interface/wx/fontenum.h +++ b/interface/wx/fontenum.h @@ -39,7 +39,7 @@ public: Call OnFontEncoding() for each encoding supported by the given font - or for each encoding supported by at least some font if @a font is not specified. */ - virtual bool EnumerateEncodings(const wxString& font = ""); + virtual bool EnumerateEncodings(const wxString& font = wxEmptyString); /** Call OnFacename() for each font which supports given encoding (only if diff --git a/interface/wx/frame.h b/interface/wx/frame.h index 55fafa7218..e9c4e1a6af 100644 --- a/interface/wx/frame.h +++ b/interface/wx/frame.h @@ -175,12 +175,11 @@ public: Used in two-step frame construction. See wxFrame() 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 = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Creates a status bar at the bottom of the frame. @@ -205,10 +204,9 @@ public: @see SetStatusText(), OnCreateStatusBar(), GetStatusBar() */ - virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = 0, - wxWindowID id = -1, - const wxString& name = "statusBar"); + virtual wxStatusBar* CreateStatusBar(int number = 1, long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, + wxWindowID id = 0, + const wxString& name = wxStatusLineNameStr); /** Creates a toolbar at the top or left of the frame. @@ -241,8 +239,8 @@ public: @see CreateStatusBar(), OnCreateToolBar(), SetToolBar(), GetToolBar() */ virtual wxToolBar* CreateToolBar(long style = wxBORDER_NONE | wxTB_HORIZONTAL, - wxWindowID id = -1, - const wxString& name = "toolBar"); + wxWindowID id = wxID_ANY, + const wxString& name = wxToolBarNameStr); /** Returns the origin of the frame client area (in client coordinates). @@ -398,7 +396,7 @@ public: width of all fields, minus the sum of widths of the non-variable fields, divided by the number of variable fields. */ - virtual void SetStatusWidths(int n, int* widths); + virtual void SetStatusWidths(int n, const int* widths_field); /** Associates a toolbar with the frame. diff --git a/interface/wx/gauge.h b/interface/wx/gauge.h index f583c15c10..a36e7a444a 100644 --- a/interface/wx/gauge.h +++ b/interface/wx/gauge.h @@ -87,10 +87,9 @@ public: */ bool Create(wxWindow* parent, wxWindowID id, int range, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, + const wxSize& size = wxDefaultSize, long style = wxGA_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "gauge"); + const wxString& name = wxGaugeNameStr); /** Returns the width of the 3D bezel face. diff --git a/interface/wx/hyperlink.h b/interface/wx/hyperlink.h index fa33892e62..0b1685eb8d 100644 --- a/interface/wx/hyperlink.h +++ b/interface/wx/hyperlink.h @@ -111,13 +111,11 @@ public: @param name Window name. */ - bool Create(wxWindow* parent, wxWindowID id, - const wxString& label, - const wxString& url, - const wxPoint& pos = wxDefaultPosition, + bool Create(wxWindow* parent, wxWindowID id, const wxString& label, + const wxString& url, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHL_DEFAULT_STYLE, - const wxString& name = "hyperlink"); + const wxString& name = wxHyperlinkCtrlNameStr); /** Returns the colour used to print the label of the hyperlink when the mouse is diff --git a/interface/wx/icon.h b/interface/wx/icon.h index b51860c24e..3f5e9dcf25 100644 --- a/interface/wx/icon.h +++ b/interface/wx/icon.h @@ -271,7 +271,7 @@ public: @param icon Icon to assign. */ - wxIcon operator =(const wxIcon& icon); + wxIcon& operator=(const wxIcon& icon); }; /** diff --git a/interface/wx/iconbndl.h b/interface/wx/iconbndl.h index 26fb8349bf..0b4335242a 100644 --- a/interface/wx/iconbndl.h +++ b/interface/wx/iconbndl.h @@ -91,7 +91,7 @@ public: /** Assignment operator, using @ref overview_refcount "reference counting". */ - wxIconBundle operator =(const wxIconBundle& ic); + wxIconBundle& operator=(const wxIconBundle& ic); /** Equality operator. This returns @true if two icon bundles are equal. diff --git a/interface/wx/intl.h b/interface/wx/intl.h index d31d7193d8..a4def9c77f 100644 --- a/interface/wx/intl.h +++ b/interface/wx/intl.h @@ -666,7 +666,7 @@ public: @see AddCatalog() */ - bool IsLoaded(const char* domain) const; + bool IsLoaded(const wxString& domain) const; /** Returns @true if the locale could be set successfully. diff --git a/interface/wx/laywin.h b/interface/wx/laywin.h index 8256747bf4..852c635ac2 100644 --- a/interface/wx/laywin.h +++ b/interface/wx/laywin.h @@ -225,7 +225,7 @@ public: @param name Window name. */ - bool Create(wxSashLayoutWindow* parent, wxWindowID id, + bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCLIP_CHILDREN | wxSW_3D, @@ -316,7 +316,7 @@ public: client area the window sticks to). One of wxLAYOUT_TOP, wxLAYOUT_LEFT, wxLAYOUT_RIGHT, wxLAYOUT_BOTTOM. */ - void GetAlignment() const; + wxLayoutAlignment GetAlignment() const; /** Returns the flags associated with this event. Not currently used. diff --git a/interface/wx/log.h b/interface/wx/log.h index 0648a57f84..9c4b772c65 100644 --- a/interface/wx/log.h +++ b/interface/wx/log.h @@ -57,19 +57,19 @@ public: @see OnFrameDelete() */ - virtual bool OnFrameClose(wxFrame frame); + virtual bool OnFrameClose(wxFrame* frame); /** Called immediately after the log frame creation allowing for any extra initializations. */ - virtual void OnFrameCreate(wxFrame frame); + virtual void OnFrameCreate(wxFrame* frame); /** Called right before the log frame is going to be deleted: will always be called unlike OnFrameClose(). */ - virtual void OnFrameDelete(wxFrame frame); + virtual void OnFrameDelete(wxFrame* frame); /** Shows or hides the frame. @@ -456,7 +456,7 @@ public: The buffer can be cleared by Flush() which will also show the current contents to the user. */ - const wxString GetBuffer(); + const wxString& GetBuffer() const; }; diff --git a/interface/wx/mediactrl.h b/interface/wx/mediactrl.h index 72b7bd1fba..263e6b42cb 100644 --- a/interface/wx/mediactrl.h +++ b/interface/wx/mediactrl.h @@ -315,7 +315,7 @@ public: @row2col{wxMEDIASTATE_PLAYING, The movie is currently playing.} @endTable */ - wxMediaCtrlState GetState(); + wxMediaState GetState(); /** Gets the volume of the media from a 0.0 to 1.0 range. @@ -352,13 +352,13 @@ public: /** Same as Load(const wxURI& uri). Kept for wxPython compatibility. */ - bool LoadURI(const wxURI& uri); + bool LoadURI(const wxString& fileName); /** Same as Load(const wxURI& uri, const wxURI& proxy). Kept for wxPython compatibility. */ - bool LoadURIWithProxy(const wxURI& uri, const wxURI& proxy); + bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy); /** Pauses playback of the movie. @@ -376,7 +376,7 @@ public: @todo Document the wxSeekMode parameter @a mode, and perhaps also the wxFileOffset and wxSeekMode themselves. */ - wxFileOffset Seek(wxFileOffset where, wxSeekMode mode); + wxFileOffset Seek(wxFileOffset where, wxSeekMode mode = wxFromStart); /** Sets the playback rate, or speed of the media, to that referred by @a dRate. diff --git a/interface/wx/memory.h b/interface/wx/memory.h index d7556f5186..88a86afca1 100644 --- a/interface/wx/memory.h +++ b/interface/wx/memory.h @@ -33,7 +33,7 @@ public: success. Returns -1 if an error was detected that prevents further checking. */ - int Check(); + static int Check(bool checkAll = false); /** Performs a memory dump from the currently set checkpoint, writing to the diff --git a/interface/wx/menu.h b/interface/wx/menu.h index de697027c9..3e17236f68 100644 --- a/interface/wx/menu.h +++ b/interface/wx/menu.h @@ -89,7 +89,7 @@ public: @remarks Only use this when the menu bar has been associated with a frame; otherwise, use the wxMenu equivalent call. */ - void Check(int id, const bool check); + void Check(int id, bool check); /** Enables or disables (greys out) a menu item. @@ -114,7 +114,7 @@ public: @remarks Only use this when the menu bar has been associated with a frame. */ - void EnableTop(int pos, const bool enable); + virtual void EnableTop(size_t pos, bool enable); /** Finds the menu item object associated with the given menu item identifier. @@ -126,7 +126,7 @@ public: @return The found menu item object, or @NULL if one was not found. */ - wxMenuItem* FindItem(int id, wxMenu menu = NULL) const; + virtual wxMenuItem* FindItem(int id, wxMenu* menu = NULL) const; /** Returns the index of the menu with the given @a title or @c wxNOT_FOUND if no @@ -197,12 +197,12 @@ public: @see SetLabelTop() */ - wxString GetLabelTop(int pos) const; + wxString GetLabelTop(size_t pos) const; /** Returns the menu at @a menuIndex (zero-based). */ - wxMenu* GetMenu(int menuIndex) const; + wxMenu* GetMenu(size_t menuIndex) const; /** Returns the number of menus in this menubar. @@ -223,7 +223,7 @@ public: @see GetMenuLabelText(), SetMenuLabel() */ - wxString GetMenuLabel(int pos) const; + virtual wxString GetMenuLabel(size_t pos) const; /** Returns the label of a top-level menu. Note that the returned string does not @@ -239,7 +239,7 @@ public: @see GetMenuLabel(), SetMenuLabel() */ - wxString GetMenuLabelText(int pos) const; + virtual wxString GetMenuLabelText(size_t pos) const; /** Inserts the menu at the given position into the menu bar. Inserting menu at @@ -282,7 +282,7 @@ public: /** Redraw the menu bar */ - void Refresh(); + virtual void Refresh(bool eraseBackground = true, const wxRect* rect = NULL); /** Removes the menu from the menu bar and returns the menu object - the caller @@ -351,7 +351,7 @@ public: @see GetLabelTop() */ - void SetLabelTop(int pos, const wxString& label); + void SetLabelTop(size_t pos, const wxString& label); /** Sets the label of a top-level menu. @@ -363,7 +363,7 @@ public: @remarks Use only after the menubar has been associated with a frame. */ - void SetMenuLabel(int pos, const wxString& label); + virtual void SetMenuLabel(size_t pos, const wxString& label); }; @@ -570,7 +570,7 @@ public: @see Append(), InsertCheckItem() */ wxMenuItem* AppendCheckItem(int id, const wxString& item, - const wxString& helpString = ""); + const wxString& help = wxEmptyString); /** Adds a radio item to the end of the menu. @@ -580,7 +580,7 @@ public: @see Append(), InsertRadioItem() */ wxMenuItem* AppendRadioItem(int id, const wxString& item, - const wxString& helpString = ""); + const wxString& help = wxEmptyString); /** Adds a separator to the end of the menu. @@ -613,7 +613,7 @@ public: @see IsChecked() */ - void Check(int id, const bool check); + void Check(int id, bool check); /** Deletes the menu item from the menu. If the item is a submenu, it will @@ -671,7 +671,7 @@ public: @see IsEnabled() */ - void Enable(int id, const bool enable); + void Enable(int id, bool enable); /** Finds the menu id for a menu item string. @@ -764,7 +764,7 @@ public: @see SetTitle() */ - wxString GetTitle() const; + const wxString& GetTitle() const; /** Inserts the given @a item before the position @a pos. @@ -794,18 +794,16 @@ public: @see Insert(), AppendCheckItem() */ - wxMenuItem* InsertCheckItem(size_t pos, int id, - const wxString& item, - const wxString& helpString = ""); + wxMenuItem* InsertCheckItem(size_t pos, int id, const wxString& item, + const wxString& helpString = wxEmptyString); /** Inserts a radio item at the given position. @see Insert(), AppendRadioItem() */ - wxMenuItem* InsertRadioItem(size_t pos, int id, - const wxString& item, - const wxString& helpString = ""); + wxMenuItem* InsertRadioItem(size_t pos, int id, const wxString& item, + const wxString& helpString = wxEmptyString); /** Inserts a separator at the given position. @@ -862,7 +860,7 @@ public: @see Prepend(), AppendCheckItem() */ wxMenuItem* PrependCheckItem(int id, const wxString& item, - const wxString& helpString = ""); + const wxString& helpString = wxEmptyString); /** Inserts a radio item at position 0. @@ -870,7 +868,7 @@ public: @see Prepend(), AppendRadioItem() */ wxMenuItem* PrependRadioItem(int id, const wxString& item, - const wxString& helpString = ""); + const wxString& helpString = wxEmptyString); /** Inserts a separator at position 0. diff --git a/interface/wx/menuitem.h b/interface/wx/menuitem.h index eb25e171da..93f66572ee 100644 --- a/interface/wx/menuitem.h +++ b/interface/wx/menuitem.h @@ -109,7 +109,7 @@ public: /** Returns the checked or unchecked bitmap (Windows only). */ - wxBitmap GetBitmap(bool checked = true) const; + virtual const wxBitmap& GetBitmap() const; /** Returns the font associated with the menu item (Windows only). @@ -119,7 +119,7 @@ public: /** Returns the help string associated with the menu item. */ - wxString GetHelp() const; + const wxString& GetHelp() const; /** Returns the menu item identifier. @@ -212,7 +212,7 @@ public: @see GetLabel(), GetLabelFromText() */ - wxString GetText() const; + const wxString& GetText() const; /** Returns the text colour associated with the menu item (Windows only). @@ -285,12 +285,12 @@ public: /** Sets the parent menu which will contain this menu item. */ - void SetMenu(const wxMenu* menu); + void SetMenu(wxMenu* menu); /** Sets the submenu of this menu item. */ - void SetSubMenu(const wxMenu* menu); + void SetSubMenu(wxMenu* menu); /** Sets the text associated with the menu item. diff --git a/interface/wx/mimetype.h b/interface/wx/mimetype.h index 4546827df8..c5e7b48100 100644 --- a/interface/wx/mimetype.h +++ b/interface/wx/mimetype.h @@ -324,7 +324,7 @@ public: This happens when one file extension is mapped to different MIME types by KDE, mailcap and mime.types. */ - bool GetMimeType(wxArrayString& mimeTypes); + bool GetMimeTypes(wxArrayString& mimeTypes) const; //@{ /** @@ -351,6 +351,7 @@ public: The name of the file is retrieved from the MessageParameters class. */ - bool GetPrintCommand(wxString* command, MessageParameters& params); + bool GetPrintCommand(wxString* command, + const MessageParameters& params) const; }; diff --git a/interface/wx/minifram.h b/interface/wx/minifram.h index 0d2d310d0d..c37afc418d 100644 --- a/interface/wx/minifram.h +++ b/interface/wx/minifram.h @@ -103,11 +103,10 @@ public: 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 wxString& name = "frame"); + const wxString& name = wxFrameNameStr); }; diff --git a/interface/wx/msgdlg.h b/interface/wx/msgdlg.h index 0c0c2bdd94..88243d4bec 100644 --- a/interface/wx/msgdlg.h +++ b/interface/wx/msgdlg.h @@ -96,12 +96,12 @@ public: which don't support extended messages, it is simply appended to the normal message with a new line separating them. */ - void SetExtendedMessage(const wxString extendedMessage); + virtual void SetExtendedMessage(const wxString& extendedMessage); /** Sets the message shown by the dialog. */ - void SetMessage(const wxString msg); + virtual void SetMessage(const wxString& message); /** Overrides the default labels of the OK and Cancel buttons. diff --git a/interface/wx/palette.h b/interface/wx/palette.h index 1884f01f16..0a4f35678b 100644 --- a/interface/wx/palette.h +++ b/interface/wx/palette.h @@ -132,9 +132,8 @@ public: @see GetPixel() */ - bool GetRGB(int pixel, const unsigned char* red, - const unsigned char* green, - const unsigned char* blue) const; + bool GetRGB(int pixel, unsigned char* red, unsigned char* green, + unsigned char* blue) const; /** Returns @true if palette data is present. diff --git a/interface/wx/panel.h b/interface/wx/panel.h index 18affd636a..cd76e4bee9 100644 --- a/interface/wx/panel.h +++ b/interface/wx/panel.h @@ -86,7 +86,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, - const wxString& name = "panel"); + const wxString& name = wxPanelNameStr); /** Sends a wxInitDialogEvent, which in turn transfers data to the dialog via diff --git a/interface/wx/pen.h b/interface/wx/pen.h index 4fd383c289..38a652feed 100644 --- a/interface/wx/pen.h +++ b/interface/wx/pen.h @@ -295,7 +295,7 @@ public: @see GetDashes() */ - virtual void SetDashes(int n, wxDash* dashes); + virtual void SetDashes(int n, const wxDash* dash); /** Sets the pen join style, which may be one of @c wxJOIN_BEVEL, @c wxJOIN_ROUND @@ -312,7 +312,7 @@ public: @see GetStipple() */ - virtual void SetStipple(wxBitmap* stipple); + virtual void SetStipple(const wxBitmap& stipple); /** Set the pen style. @@ -339,7 +339,7 @@ public: /** Assignment operator, using @ref overview_refcount. */ - wxPen operator =(const wxPen& pen); + wxPen& operator=(const wxPen& pen); /** Equality operator. diff --git a/interface/wx/print.h b/interface/wx/print.h index b6f61dba8b..7d9c05ce32 100644 --- a/interface/wx/print.h +++ b/interface/wx/print.h @@ -295,7 +295,7 @@ public: The implementation simply blits the preview bitmap onto the canvas, creating a new preview bitmap if none exists. */ - bool PaintPage(wxPreviewCanvas* canvas, wxDC dc); + virtual bool PaintPage(wxPreviewCanvas* canvas, wxDC& dc); /** Invokes the print process using the second wxPrintout object @@ -321,7 +321,7 @@ public: /** Sets the current page to be previewed. */ - void SetCurrentPage(int pageNum); + virtual bool SetCurrentPage(int pageNum); /** Sets the frame to be used for displaying the print preview canvas @@ -373,7 +373,7 @@ public: /** Creates the default printing abort window, with a cancel button. */ - void CreateAbortWindow(wxWindow* parent, wxPrintout* printout); + virtual wxWindow* CreateAbortWindow(wxWindow* parent, wxPrintout* printout); /** Returns @true if the user has aborted the print job. diff --git a/interface/wx/printdlg.h b/interface/wx/printdlg.h index 76863350f3..a02e924c55 100644 --- a/interface/wx/printdlg.h +++ b/interface/wx/printdlg.h @@ -52,7 +52,7 @@ public: Returns the @ref overview_printing_printdata "print dialog data" associated with the print dialog. */ - wxPrintDialogData GetPrintDialogData(); + virtual wxPrintDialogData& GetPrintDialogData(); /** Shows the dialog, returning @c wxID_OK if the user pressed OK, and @c diff --git a/interface/wx/progdlg.h b/interface/wx/progdlg.h index 808ffd7c23..1c56dd98ad 100644 --- a/interface/wx/progdlg.h +++ b/interface/wx/progdlg.h @@ -78,8 +78,7 @@ public: (if present) to "Unknown" or to @a newmsg (if it's non-empty); moves the progress bar a bit to indicate that some progress was done. */ - virtual bool Pulse(const wxString& newmsg = "", - bool* skip = NULL); + virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool* skip = NULL); /** Can be used to continue with the dialog, after the user had clicked the "Abort" button. diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h index 37df727d2f..e072904cb2 100644 --- a/interface/wx/propdlg.h +++ b/interface/wx/propdlg.h @@ -127,12 +127,11 @@ public: /** Call this from your own Create function, before adding buttons and pages. */ - 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 = wxDEFAULT_DIALOG_STYLE, - const wxString& name = "dialogBox"); + const wxString& name = wxDialogNameStr); /** Override this if you wish to create a different kind of book control; by diff --git a/interface/wx/protocol/ftp.h b/interface/wx/protocol/ftp.h index 0455b287a9..b0f932fcd4 100644 --- a/interface/wx/protocol/ftp.h +++ b/interface/wx/protocol/ftp.h @@ -153,7 +153,7 @@ public: @see GetFilesList() */ bool GetDirList(wxArrayString& files, - const wxString& wildcard = ""); + const wxString& wildcard = wxEmptyString); /** Returns the file size in bytes or -1 if the file doesn't exist or the size @@ -177,7 +177,7 @@ public: @see GetDirList() */ bool GetFilesList(wxArrayString& files, - const wxString& wildcard = ""); + const wxString& wildcard = wxEmptyString); /** Creates a new input stream on the specified path. @@ -197,7 +197,7 @@ public: /** Returns the last command result, i.e. the full server reply for the last command. */ - const wxString GetLastResult(); + const wxString& GetLastResult(); /** Initializes an output stream to the specified @e file. diff --git a/interface/wx/quantize.h b/interface/wx/quantize.h index a9cfec9df6..b98564cb36 100644 --- a/interface/wx/quantize.h +++ b/interface/wx/quantize.h @@ -33,9 +33,9 @@ public: Fills @a out_rows with indexes into palette (which is also stored into @a palette variable). */ - void DoQuantize(unsigned w, unsigned h, unsigned char** in_rows, - unsigned char** out_rows, unsigned char* palette, - int desiredNoColours); + static void DoQuantize(unsigned int w, unsigned int h, + unsigned char** in_rows, unsigned char** out_rows, + unsigned char* palette, int desiredNoColours); /** Reduce the colours in the source image and put the result into the destination image. diff --git a/interface/wx/radiobox.h b/interface/wx/radiobox.h index d3bc7cb567..0e90417251 100644 --- a/interface/wx/radiobox.h +++ b/interface/wx/radiobox.h @@ -194,7 +194,7 @@ public: @param string The string to find. */ - int FindString(const wxString& string) const; + virtual int FindString(const wxString& s, bool bCase = false) const; /** Returns the number of columns in the radiobox. @@ -208,7 +208,7 @@ public: @param pt Point in client coordinates. */ - int GetItemFromPoint(const wxPoint pt) const; + virtual int GetItemFromPoint(const wxPoint& pt) const; /** Returns the helptext associated with the specified @a item if any or @c diff --git a/interface/wx/radiobut.h b/interface/wx/radiobut.h index fe0690b3f4..ef4dd21c76 100644 --- a/interface/wx/radiobut.h +++ b/interface/wx/radiobut.h @@ -94,13 +94,11 @@ public: Creates the choice for two-step construction. See wxRadioButton() for further details. */ - bool Create(wxWindow* parent, wxWindowID id, - const wxString& label, + bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, + const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "radioButton"); + const wxString& name = wxRadioButtonNameStr); /** Returns @true if the radio button is depressed, @false otherwise. @@ -114,6 +112,6 @@ public: @param value @true to select, @false to deselect. */ - void SetValue(const bool value); + virtual void SetValue(bool value); }; diff --git a/interface/wx/region.h b/interface/wx/region.h index e010f22909..5d190a430d 100644 --- a/interface/wx/region.h +++ b/interface/wx/region.h @@ -427,7 +427,7 @@ public: /** Assignment operator, using @ref overview_refcount. */ - void operator =(const wxRegion& region); + wxRegion& operator=(const wxRegion& region); }; /** diff --git a/interface/wx/renderer.h b/interface/wx/renderer.h index 12f4d16f10..f4557f9bbd 100644 --- a/interface/wx/renderer.h +++ b/interface/wx/renderer.h @@ -293,8 +293,8 @@ public: @a flags may have the @c wxCONTROL_CHECKED, @c wxCONTROL_CURRENT or @c wxCONTROL_UNDETERMINED bit set, see @ref wxCONTROL_FLAGS. */ - virtual void DrawCheckBox(wxWindow* win, wxDC& dc, - const wxRect& rect, int flags); + virtual void DrawCheckBox(wxWindow* win, wxDC& dc, const wxRect& rect, + int flags = 0) = 0; /** Draw a button like the one used by wxComboBox to show a @@ -304,8 +304,7 @@ public: see @ref wxCONTROL_FLAGS. */ virtual void DrawComboBoxDropButton(wxWindow* win, wxDC& dc, - const wxRect& rect, - int flags); + const wxRect& rect, int flags = 0) = 0; /** Draw a drop down arrow that is suitable for use outside a combo box. Arrow will @@ -318,7 +317,7 @@ public: see @ref wxCONTROL_FLAGS. */ virtual void DrawDropArrow(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags); + int flags = 0) = 0; /** Draw a focus rectangle using the specified rectangle. @@ -380,8 +379,8 @@ public: @a flags may have the @c wxCONTROL_PRESSED, @c wxCONTROL_CURRENT or @c wxCONTROL_ISDEFAULT bit set, see @ref wxCONTROL_FLAGS. */ - virtual void DrawPushButton(wxWindow* win, wxDC& dc, - const wxRect& rect, int flags); + virtual void DrawPushButton(wxWindow* win, wxDC& dc, const wxRect& rect, + int flags = 0) = 0; /** Draw the border for sash window: this border must be such that the sash diff --git a/interface/wx/scrolbar.h b/interface/wx/scrolbar.h index 8a2d72c3c0..03c651bf30 100644 --- a/interface/wx/scrolbar.h +++ b/interface/wx/scrolbar.h @@ -157,10 +157,9 @@ public: */ bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, + const wxSize& size = wxDefaultSize, long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "scrollBar"); + const wxString& name = wxScrollBarNameStr); /** Returns the page size of the scrollbar. diff --git a/interface/wx/slider.h b/interface/wx/slider.h index d4a6fdc03e..55f112fccb 100644 --- a/interface/wx/slider.h +++ b/interface/wx/slider.h @@ -176,13 +176,11 @@ public: Used for two-step slider construction. See wxSlider() for further details. */ - bool Create(wxWindow* parent, wxWindowID id, int value, - int minValue, int maxValue, - const wxPoint& point = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, + bool Create(wxWindow* parent, wxWindowID id, int value, int minValue, + int maxValue, const wxPoint& point = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = wxSL_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "slider"); + const wxString& name = wxSliderNameStr); /** Returns the line size. diff --git a/interface/wx/spinctrl.h b/interface/wx/spinctrl.h index 3095b42a2a..2d25732693 100644 --- a/interface/wx/spinctrl.h +++ b/interface/wx/spinctrl.h @@ -91,13 +91,12 @@ public: Creation function called by the spin control constructor. See wxSpinCtrl() for details. */ - bool Create(wxWindow* parent, wxWindowID id = -1, + bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS, - int min = 0, int max = 100, - int initial = 0, const wxString& name = _T("wxSpinCtrl")); + long style = wxSP_ARROW_KEYS, int min = 0, int max = 100, + int initial = 0, const wxString& name = "wxSpinCtrl"); /** Gets maximal allowable value. diff --git a/interface/wx/statbmp.h b/interface/wx/statbmp.h index f36675be77..3ea164f8f7 100644 --- a/interface/wx/statbmp.h +++ b/interface/wx/statbmp.h @@ -61,12 +61,10 @@ public: /** Creation function, for two-step construction. For details see wxStaticBitmap(). */ - bool Create(wxWindow* parent, wxWindowID id, - const wxBitmap& label, + bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& label, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = "staticBitmap"); + const wxSize& size = wxDefaultSize, long style = 0, + const wxString& name = wxStaticBitmapNameStr); /** Returns the bitmap currently used in the control. diff --git a/interface/wx/stattext.h b/interface/wx/stattext.h index dbf2fa6252..ca1a02a315 100644 --- a/interface/wx/stattext.h +++ b/interface/wx/stattext.h @@ -81,12 +81,10 @@ public: /** Creation function, for two-step construction. For details see wxStaticText(). */ - bool Create(wxWindow* parent, wxWindowID id, - const wxString& label, + bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = "staticText"); + const wxSize& size = wxDefaultSize, long style = 0, + const wxString& name = wxStaticTextNameStr); /** Returns the contents of the control. diff --git a/interface/wx/statusbr.h b/interface/wx/statusbr.h index ea9c25058a..957f2e2339 100644 --- a/interface/wx/statusbr.h +++ b/interface/wx/statusbr.h @@ -69,7 +69,7 @@ public: */ bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, long style = wxST_SIZEGRIP, - const wxString& name = "statusBar"); + const wxString& name = wxStatusBarNameStr); /** Returns the size and position of a field's internal bounding rectangle. @@ -126,7 +126,7 @@ public: An array of n integers interpreted in the same way as in SetStatusWidths(). */ - virtual void SetFieldsCount(int number = 1, int* widths = NULL); + virtual void SetFieldsCount(int number = 1, const int* widths = NULL); /** Sets the minimal possible height for the status bar. @@ -150,7 +150,7 @@ public: - wxSB_FLAT: No border is painted around the field so that it appears flat. - wxSB_RAISED: A raised 3D border is painted around the field. */ - virtual void SetStatusStyles(int n, int* styles); + virtual void SetStatusStyles(int n, const int* styles); /** Sets the text for one field. @@ -191,6 +191,6 @@ public: @see SetFieldsCount(), wxFrame::SetStatusWidths() */ - virtual void SetStatusWidths(int n, int* widths); + virtual void SetStatusWidths(int n, const int* widths_field); }; diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h index 38cb6b0eab..f936debde1 100644 --- a/interface/wx/stc/stc.h +++ b/interface/wx/stc/stc.h @@ -934,12 +934,12 @@ public: /** */ - wxString GetCurLine(int* OUTPUT); + wxString GetCurLine(int* linePos = NULL); /** */ - wxCharBuffer GetCurLineRaw(int* OUTPUT); + wxCharBuffer GetCurLineRaw(int* linePos = NULL); /** END of generated section @@ -1022,7 +1022,7 @@ public: /** Are the indentation guides visible? */ - bool GetIndentationGuides(); + int GetIndentationGuides() const; /** Find the last child line of a header line. @@ -1626,7 +1626,7 @@ public: /** Load the contents of filename into the editor */ - bool LoadFile(const wxString& filename); + bool LoadFile(const wxString& file, int fileType = wxTEXT_TYPE_ANY); /** Transform the selection to lower case. @@ -1847,7 +1847,7 @@ public: /** Write the contents of the editor to filename */ - bool SaveFile(const wxString& filename); + bool SaveFile(const wxString& file = wxEmptyString, int fileType = wxTEXT_TYPE_ANY); /** Scroll enough to make the given column visible @@ -1903,7 +1903,7 @@ public: /** Send a message to Scintilla */ - long SendMsg(int msg, long wp = 0, long lp = 0); + wxIntPtr SendMsg(int msg, wxUIntPtr wp = 0, wxIntPtr lp = 0) const; /** Set the selection anchor to a position. The anchor is the opposite @@ -2080,7 +2080,7 @@ public: /** Show or hide indentation guides. */ - void SetIndentationGuides(bool show); + void SetIndentationGuides(int indentView); /** Set up the key words used by the lexer. @@ -2246,7 +2246,7 @@ public: /** Select a range of text. */ - void SetSelection(int start, int end); + virtual void SetSelection(long from, long to); /** Sets the position that ends the selection - this becomes the currentPosition. diff --git a/interface/wx/stdpaths.h b/interface/wx/stdpaths.h index ee4c21030e..5cd13375d7 100644 --- a/interface/wx/stdpaths.h +++ b/interface/wx/stdpaths.h @@ -126,8 +126,8 @@ public: @since 2.7.0 */ - wxString GetLocalizedResourcesDir(const wxString& lang, - ResourceCat category = ResourceCat_None) const; + virtual wxString GetLocalizedResourcesDir(const wxString& lang, + ResourceCat category) const; /** Return the directory where the loadable modules (plugins) live. diff --git a/interface/wx/taskbar.h b/interface/wx/taskbar.h index 34aaf946fb..c0acf5cebc 100644 --- a/interface/wx/taskbar.h +++ b/interface/wx/taskbar.h @@ -116,7 +116,8 @@ public: /** Sets the icon, and optional tooltip text. */ - bool SetIcon(const wxIcon& icon, const wxString& tooltip); + virtual bool SetIcon(const wxIcon& icon, + const wxString& tooltip = wxEmptyString); /** Returns true if system tray is available in the desktop environment the diff --git a/interface/wx/textctrl.h b/interface/wx/textctrl.h index be226d3b26..2e8f2cd1c6 100644 --- a/interface/wx/textctrl.h +++ b/interface/wx/textctrl.h @@ -256,12 +256,12 @@ public: Returns the bullet text, which could be a symbol, or (for example) cached outline text. */ - const wxString GetBulletText() const; + const wxString& GetBulletText() const; /** Returns the name of the character style. */ - const wxString GetCharacterStyleName() const; + const wxString& GetCharacterStyleName() const; /** Returns flags indicating which attributes are applicable. @@ -293,7 +293,7 @@ public: /** Returns the font face name. */ - const wxString GetFontFaceName() const; + const wxString& GetFontFaceName() const; /** Returns the font size in points. @@ -333,12 +333,12 @@ public: /** Returns the name of the list style. */ - const wxString GetListStyleName() const; + const wxString& GetListStyleName() const; /** Returns the outline level. */ - bool GetOutlineLevel() const; + int GetOutlineLevel() const; /** Returns the space in tenths of a millimeter after the paragraph. @@ -353,7 +353,7 @@ public: /** Returns the name of the paragraph style. */ - const wxString GetParagraphStyleName() const; + const wxString& GetParagraphStyleName() const; /** Returns the right indent in tenths of a millimeter. @@ -366,12 +366,12 @@ public: Each stop is measured from the left margin and therefore each value must be larger than the last. */ - const wxArrayInt GetTabs() const; + const wxArrayInt& GetTabs() const; /** Returns the text foreground colour. */ - const wxColour GetTextColour() const; + const wxColour& GetTextColour() const; /** Returns the text effect bits of interest. @@ -392,7 +392,7 @@ public: hand cursor over it, and wxRichTextCtrl generates a wxTextUrlEvent when the content is clicked. */ - const wxString GetURL() const; + const wxString& GetURL() const; /** Returns @true if the attribute object specifies alignment. @@ -616,7 +616,7 @@ public: Sets the bullet text, which could be a symbol, or (for example) cached outline text. */ - void SetBulletText(const wxString text); + void SetBulletText(const wxString& text); /** Sets the character style name. @@ -633,7 +633,7 @@ public: Sets the attributes for the given font. Note that wxTextAttr does not store an actual wxFont object. */ - void SetFont(const wxFont& font); + void SetFont(const wxFont& font, int flags = wxTEXT_ATTR_FONT); /** Sets the font encoding. @@ -1181,10 +1181,9 @@ public: non-default constructor. */ bool Create(wxWindow* parent, wxWindowID id, - const wxString& value = "", + const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, + const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr); @@ -1217,7 +1216,7 @@ public: @see SetDefaultStyle() */ - const wxTextAttr GetDefaultStyle() const; + virtual const wxTextAttr& GetDefaultStyle() const; /** Returns the insertion point, or cursor, position. @@ -1508,7 +1507,7 @@ public: @return @true if the operation was successful, @false otherwise. */ - bool SaveFile(const wxString& filename, + bool SaveFile(const wxString& filename = wxEmptyString, int fileType = wxTEXT_TYPE_ANY); /** @@ -1545,7 +1544,7 @@ public: @see IsEditable() */ - virtual void SetEditable(const bool editable); + virtual void SetEditable(bool editable); /** Sets the insertion point at the given position. diff --git a/interface/wx/textfile.h b/interface/wx/textfile.h index 60b7d4e2e6..fdeb78dd00 100644 --- a/interface/wx/textfile.h +++ b/interface/wx/textfile.h @@ -85,7 +85,7 @@ public: Adds a line to the end of file. */ void AddLine(const wxString& str, - wxTextFileType type = typeDefault) const; + wxTextFileType type = wxTextBuffer::typeDefault); /** Delete all lines from the file, set current line number to 0. @@ -154,7 +154,7 @@ public: // do something with the last line in str @endcode */ - wxString GetFirstLine() const; + wxString& GetFirstLine(); /** Gets the last line of the file. @@ -174,7 +174,7 @@ public: // do something with the first line in str @endcode */ - wxString GetLastLine(); + wxString& GetLastLine(); /** Retrieves the line number @a n from the file. @@ -182,7 +182,7 @@ public: The returned line may be modified but you shouldn't add line terminator at the end - this will be done by wxTextFile. */ - wxString GetLine(size_t n) const; + wxString& GetLine(size_t n) const; /** Get the number of lines in the file. @@ -197,17 +197,17 @@ public: /** Get the name of the file. */ - const char* GetName() const; + const wxString& GetName() const; /** Gets the next line (see GetFirstLine() for the example). */ - wxString GetNextLine(); + wxString& GetNextLine(); /** Gets the previous line in the file. */ - wxString GetPrevLine(); + wxString& GetPrevLine(); /** Changes the value returned by GetCurrentLine() and used by GetFirstLine() @@ -228,7 +228,7 @@ public: Insert a line before the line number @a n. */ void InsertLine(const wxString& str, size_t n, - wxTextFileType type = typeDefault) const; + wxTextFileType type = wxTextBuffer::typeDefault); /** Returns @true if the file is currently opened. @@ -274,6 +274,6 @@ public: /** The same as GetLine(). */ - wxString operator[](size_t n) const; + wxString& operator[](size_t n) const; }; diff --git a/interface/wx/tokenzr.h b/interface/wx/tokenzr.h index ed88750a31..a609e1557d 100644 --- a/interface/wx/tokenzr.h +++ b/interface/wx/tokenzr.h @@ -115,7 +115,7 @@ public: GetNextToken() is called and when it reaches 0, HasMoreTokens() returns @false. */ - int CountTokens() const; + size_t CountTokens() const; /** Returns the delimiter which ended scan for the last token returned by diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h index d423ce473a..fc50cb0b3c 100644 --- a/interface/wx/toolbar.h +++ b/interface/wx/toolbar.h @@ -178,12 +178,11 @@ public: @see AddTool() */ - wxToolBarToolBase* AddCheckTool(int toolId, - const wxString& label, + wxToolBarToolBase* AddCheckTool(int toolId, const wxString& label, const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - const wxString& shortHelpString = "", - const wxString& longHelpString = "", + const wxBitmap& bmpDisabled = wxNullBitmap, + const wxString& shortHelp = wxEmptyString, + const wxString& longHelp = wxEmptyString, wxObject* clientData = NULL); /** @@ -202,7 +201,8 @@ public: wxMac: labels are only displayed if wxWidgets is built with @c wxMAC_USE_NATIVE_TOOLBAR set to 1 */ - bool AddControl(wxControl* control, const wxString label = ""); + virtual wxToolBarToolBase* AddControl(wxControl* control, + const wxString& label = wxEmptyString); /** Adds a new radio tool to the toolbar. Consecutive radio tools form a @@ -218,12 +218,11 @@ public: @see AddTool() */ - wxToolBarToolBase* AddRadioTool(int toolId, - const wxString& label, + wxToolBarToolBase* AddRadioTool(int toolId, const wxString& label, const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - const wxString& shortHelpString = "", - const wxString& longHelpString = "", + const wxBitmap& bmpDisabled = wxNullBitmap, + const wxString& shortHelp = wxEmptyString, + const wxString& longHelp = wxEmptyString, wxObject* clientData = NULL); /** @@ -231,7 +230,7 @@ public: @see AddTool(), SetToolSeparation() */ - void AddSeparator(); + virtual wxToolBarToolBase* AddSeparator(); /** Adds a tool to the toolbar. @@ -498,7 +497,7 @@ public: /** Returns the number of tools in the toolbar. */ - int GetToolsCount() const; + size_t GetToolsCount() const; /** Inserts the control into the toolbar at the given position. You must @@ -506,7 +505,8 @@ public: @see AddControl(), InsertTool() */ - wxToolBarToolBase* InsertControl(size_t pos, wxControl* control); + virtual wxToolBarToolBase* InsertControl(size_t pos, wxControl* control, + const wxString& label = wxEmptyString); /** Inserts the separator into the toolbar at the given position. You must @@ -593,7 +593,7 @@ public: @see OnMouseEnter(), OnLeftClick() */ - void OnRightClick(int toolId, float x, float y); + virtual void OnRightClick(int toolId, long x, long y); /** This function should be called after you have added tools. diff --git a/interface/wx/valgen.h b/interface/wx/valgen.h index ee59b3084c..15f1b2a31a 100644 --- a/interface/wx/valgen.h +++ b/interface/wx/valgen.h @@ -100,7 +100,7 @@ public: /** Clones the generic validator using the copy constructor. */ - virtual wxValidator* Clone() const; + virtual wxObject* Clone() const; /** Transfers the value from the window to the appropriate data type. diff --git a/interface/wx/valtext.h b/interface/wx/valtext.h index 21527bc796..efe0a3fa10 100644 --- a/interface/wx/valtext.h +++ b/interface/wx/valtext.h @@ -69,7 +69,7 @@ public: /** Clones the text validator using the copy constructor. */ - virtual wxValidator* Clone() const; + virtual wxObject* Clone() const; /** Returns a reference to the exclude list (the list of invalid values). -- 2.45.2