AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

many ifacecheck automatic fixes + some access-specifier manual fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi 2008-09-29 10:52:37 +00:00
parent b38a20c153
commit b91c4601f2
20 changed files with 178 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interface/wx/cmdproc.h
View File

@ -56,7 +56,7 @@ public:
processor that the action is not undoable and should not be
added to the command history.
*/
virtual bool Do();
virtual bool Do() = 0;
/**
Returns the command name.
@ -85,7 +85,7 @@ public:
processor that the action is not redoable and no change should
be made to the command history.
*/
virtual bool Undo();
virtual bool Undo() = 0;
};

98
interface/wx/combo.h
View File

@ -34,7 +34,7 @@ public:
@return @true if the call succeeded, @false otherwise.
*/
virtual bool Create(wxWindow* parent);
virtual bool Create(wxWindow* parent) = 0;
/**
Utility function that hides the popup.
@ -60,13 +60,13 @@ public:
The derived class must implement this to return pointer to the
associated control created in Create().
*/
virtual wxWindow* GetControl();
virtual wxWindow* GetControl() = 0;
/**
The derived class must implement this to return string representation
of the value.
*/
virtual wxString GetStringValue() const;
virtual wxString GetStringValue() const = 0;
/**
The derived class must implement this to initialize its internal
@ -350,19 +350,6 @@ public:
*/
virtual ~wxComboCtrl();
/**
This member function is not normally called in application code.
Instead, it can be implemented in a derived class to create a custom
popup animation.
The parameters are the same as those for DoShowPopup().
@return @true if animation finishes before the function returns,
@false otherwise. In the latter case you need to manually call
DoShowPopup() after the animation ends.
*/
virtual bool AnimateShow(const wxRect& rect, int flags);
/**
Copies the selected text to the clipboard.
*/
@ -386,38 +373,6 @@ public:
*/
virtual void Cut();
/**
This member function is not normally called in application code.
Instead, it can be implemented in a derived class to return default
wxComboPopup, incase @a popup is @NULL.
@note If you have implemented OnButtonClick() to do something else than
show the popup, then DoSetPopupControl() must always set @a popup
to @NULL.
*/
void DoSetPopupControl(wxComboPopup* popup);
/**
This member function is not normally called in application code.
Instead, it must be called in a derived class to make sure popup is
properly shown after a popup animation has finished (but only if
AnimateShow() did not finish the animation within its function scope).
@param rect
Position to show the popup window at, in screen coordinates.
@param flags
Combination of any of the following:
@beginTable
@row2col{wxComboCtrl::ShowAbove,
Popup is shown above the control instead of below.}
@row2col{wxComboCtrl::CanDeferShow,
Showing the popup can be deferred to happen sometime after
ShowPopup() has finished. In this case, AnimateShow() must
return false.}
@endTable
*/
virtual void DoShowPopup(const wxRect& rect, int flags);
/**
Enables or disables popup animation, if any, depending on the value of
the argument.
@ -749,5 +704,52 @@ public:
will appear as if the focus has been lost from it.
*/
void UseAltPopupWindow(bool enable = true);
protected:
/**
This member function is not normally called in application code.
Instead, it can be implemented in a derived class to create a custom
popup animation.
The parameters are the same as those for DoShowPopup().
@return @true if animation finishes before the function returns,
@false otherwise. In the latter case you need to manually call
DoShowPopup() after the animation ends.
*/
virtual bool AnimateShow(const wxRect& rect, int flags);
/**
This member function is not normally called in application code.
Instead, it can be implemented in a derived class to return default
wxComboPopup, incase @a popup is @NULL.
@note If you have implemented OnButtonClick() to do something else than
show the popup, then DoSetPopupControl() must always set @a popup
to @NULL.
*/
virtual void DoSetPopupControl(wxComboPopup* popup);
/**
This member function is not normally called in application code.
Instead, it must be called in a derived class to make sure popup is
properly shown after a popup animation has finished (but only if
AnimateShow() did not finish the animation within its function scope).
@param rect
Position to show the popup window at, in screen coordinates.
@param flags
Combination of any of the following:
@beginTable
@row2col{wxComboCtrl::ShowAbove,
Popup is shown above the control instead of below.}
@row2col{wxComboCtrl::CanDeferShow,
Showing the popup can be deferred to happen sometime after
ShowPopup() has finished. In this case, AnimateShow() must
return false.}
@endTable
*/
virtual void DoShowPopup(const wxRect& rect, int flags);
};

2
interface/wx/cshelp.h
View File

@ -66,7 +66,7 @@ public:
May be used to set the same help string for all Cancel buttons in
the application, for example.
*/
virtual wxString GetHelp(const wxWindowBase* window);
virtual wxString GetHelp(const wxWindowBase* window) = 0;
/**
Removes the association between the window pointer and the help text.

20
interface/wx/dataobj.h
View File

@ -91,7 +91,7 @@ public:
object by pickling it first.
@endWxPythonOnly
*/
virtual void TakeData(size_t size, const void data);
void TakeData(size_t size, void* data);
};
@ -128,7 +128,7 @@ public:
Adds the @a dataObject to the list of supported objects and it becomes
the preferred object if @a preferred is @true.
*/
void Add(wxDataObjectSimple dataObject, bool preferred = false);
void Add(wxDataObjectSimple* dataObject, bool preferred = false);
/**
Report the format passed to the SetData() method. This should be the
@ -202,7 +202,7 @@ public:
Returns the (one and only one) format supported by this object. It is
assumed that the format is supported in both directions.
*/
const wxDataFormat GetFormat() const;
const wxDataFormat& GetFormat() const;
/**
Copy the data from the buffer, return @true on success. Must be
@ -352,7 +352,7 @@ public:
/**
Returns the platform-specific number identifying the format.
*/
NativeFormat GetType() const;
wxDataFormatId GetType() const;
/**
Sets the format to be the custom format identified by the given name.
@ -363,7 +363,7 @@ public:
Sets the format to the given value, which should be one of wxDF_XXX
constants.
*/
void SetType(NativeFormat format);
void SetType(wxDataFormatId type);
/**
Returns @true if the formats are different.
@ -556,25 +556,25 @@ public:
The method will write the data of the format @a format in the buffer
@a buf and return @true on success, @false on failure.
*/
virtual bool GetDataHere(const wxDataFormat& format, void buf) const;
virtual bool GetDataHere(const wxDataFormat& format, void* buf) const = 0;
/**
Returns the data size of the given format @a format.
*/
virtual size_t GetDataSize(const wxDataFormat& format) const;
virtual size_t GetDataSize(const wxDataFormat& format) const = 0;
/**
Returns the number of available formats for rendering or setting the
data.
*/
virtual size_t GetFormatCount(Direction dir = Get) const;
virtual size_t GetFormatCount(Direction dir = Get) const = 0;
/**
Returns the preferred format for either rendering the data (if @a dir
is @c Get, its default value) or for setting it. Usually this will be
the native format of the wxDataObject.
*/
virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const;
virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const = 0;
/**
Set the data in the format @a format of the length @a len provided in
@ -691,6 +691,6 @@ public:
/**
Returns the array of file names.
*/
const wxArrayString GetFilenames() const;
const wxArrayString& GetFilenames() const;
};

76
interface/wx/dataview.h
View File

@ -32,7 +32,7 @@ public:
/**
Gets the icon.
*/
const wxIcon GetIcon() const;
const wxIcon& GetIcon() const;
/**
Gets the text.
@ -102,7 +102,7 @@ public:
/**
Returns a reference to a value.
*/
const wxVariant GetValue() const;
const wxVariant& GetValue() const;
/**
@ -223,7 +223,7 @@ public:
/**
Destructor. This should not be called directly. Use DecRef() instead.
*/
~wxDataViewModel();
virtual ~wxDataViewModel();
/**
Adds a wxDataViewModelNotifier
@ -267,29 +267,28 @@ public:
/**
Override this to indicate the number of columns in the model.
*/
virtual unsigned int GetColumnCount() const;
virtual unsigned int GetColumnCount() const = 0;
/**
Override this to indicate what type of data is stored in the
column specified by @e col. This should return a string
indicating the type of data as reported by wxVariant.
*/
virtual wxString GetColumnType(unsigned int col) const;
virtual wxString GetColumnType(unsigned int col) const = 0;
/**
Override this to indicate which wxDataViewItem representing the parent
of @a item or an invalid wxDataViewItem if the the root item is
the parent item.
*/
virtual wxDataViewItem GetParent(const wxDataViewItem& item) const;
virtual wxDataViewItem GetParent(const wxDataViewItem& item) const = 0;
/**
Override this to indicate the value of @e item
A wxVariant is used to store the data.
*/
virtual void GetValue(wxVariant& variant,
const wxDataViewItem& item,
unsigned int col) const;
virtual void GetValue(wxVariant& variant, const wxDataViewItem& item,
unsigned int col) const = 0;
/**
Override this method to indicate if a container item merely
@ -314,7 +313,7 @@ public:
Override this to indicate of @a item is a container, i.e. if
it can have child items.
*/
virtual bool IsContainer(const wxDataViewItem& item) const;
virtual bool IsContainer(const wxDataViewItem& item) const = 0;
/**
Call this to inform the model that an item has been added
@ -374,9 +373,8 @@ public:
Afterwards ValueChanged()
has to be called!
*/
virtual bool SetValue(const wxVariant& variant,
const wxDataViewItem& item,
unsigned int col);
virtual bool SetValue(const wxVariant& variant, const wxDataViewItem& item,
unsigned int col) = 0;
/**
Call this to inform this model that a value in the model has
@ -400,8 +398,8 @@ public:
wxDataViewItem (which you can obtain from this class).
This model also provides its own wxDataViewIndexListModel::Compare
method which sorts the model's data by the index.
This model is not a virtual model since the control stores
This model is not a virtual model since the control stores
each wxDataViewItem. Use wxDataViewVirtualListModel if you
need to display millions of items or have other reason to
use a virtual control.
@ -702,7 +700,7 @@ public:
@event{EVT_DATAVIEW_COLUMN_REORDERED(id, func)}
Process a wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED event.
@endEventTable
@library{wxadv}
@category{ctrl,dvc}
<!-- @appearance{dataviewctrl.png} -->
@ -714,7 +712,7 @@ public:
Default Constructor.
*/
wxDataViewCtrl();
/**
Constructor. Calls Create().
*/
@ -747,7 +745,7 @@ public:
Inserts a wxDataViewColumn to the control. Returns @true on success.
*/
virtual bool InsertColumn(unsigned int pos, wxDataViewColumn* col);
//@{
/**
Appends a column for rendering a bitmap. Returns the wxDataViewColumn
@ -771,7 +769,7 @@ public:
/**
Appends a column for rendering a date. Returns the wxDataViewColumn
created in the function or @NULL on failure.
NB: The @e align parameter is applied to both the column header and
the column renderer.
*/
@ -794,7 +792,7 @@ public:
Appends a column for rendering text with an icon. Returns the wxDataViewColumn
created in the function or @NULL on failure. This method uses the
wxDataViewIconTextRenderer class.
NB: The @e align parameter is applied to both the column header and
the column renderer.
*/
@ -816,7 +814,7 @@ public:
/**
Appends a column for rendering a progress indicator. Returns the
wxDataViewColumn created in the function or @NULL on failure.
NB: The @e align parameter is applied to both the column header and
the column renderer.
*/
@ -838,7 +836,7 @@ public:
/**
Appends a column for rendering text. Returns the wxDataViewColumn
created in the function or @NULL on failure.
NB: The @e align parameter is applied to both the column header and
the column renderer.
*/
@ -860,7 +858,7 @@ public:
/**
Appends a column for rendering a toggle. Returns the wxDataViewColumn
created in the function or @NULL on failure.
NB: The @e align parameter is applied to both the column header and
the column renderer.
*/
@ -1058,7 +1056,7 @@ public:
/**
Called by owning model.
*/
bool Cleared();
virtual bool Cleared() = 0;
/**
Get owning wxDataViewModel.
@ -1074,7 +1072,7 @@ public:
/**
Called by owning model.
*/
bool ItemChanged(const wxDataViewItem& item);
virtual bool ItemChanged(const wxDataViewItem& item) = 0;
/**
Called by owning model.
@ -1102,7 +1100,7 @@ public:
/**
Called by owning model.
*/
void Resort();
virtual void Resort() = 0;
/**
Set owner of this notifier. Used internally.
@ -1112,7 +1110,7 @@ public:
/**
Called by owning model.
*/
bool ValueChanged(const wxDataViewItem& item, unsigned int col);
virtual bool ValueChanged(const wxDataViewItem& item, unsigned int col) = 0;
};
@ -1176,7 +1174,7 @@ class wxDataViewRenderer : public wxObject
{
public:
/**
Constructor.
Constructor.
*/
wxDataViewRenderer(const wxString& varianttype,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
@ -1202,7 +1200,7 @@ public:
transfer the value back to the data model. Returns @e @false
on failure.
*/
virtual bool GetValue(wxVariant& value);
virtual bool GetValue(wxVariant& value) const = 0;
/**
Returns a string with the type of the wxVariant
@ -1212,7 +1210,7 @@ public:
/**
Sets the alignment of the renderer's content. The default value
of wxDVR_DEFAULT_ALIGMENT indicates that the content should
of wxDVR_DEFAULT_ALIGMENT indicates that the content should
have the same alignment as the column header. The method is
not implemented under OS X and the renderer always aligns its
contents as the column header on that platform. The other platforms
@ -1229,7 +1227,7 @@ public:
Set the value of the renderer (and thus its cell) to @e value.
The internal code will then render this cell with this data.
*/
virtual bool SetValue(const wxVariant& value);
virtual bool SetValue(const wxVariant& value) = 0;
/**
Before data is committed to the data model, it is passed to this
@ -1437,7 +1435,7 @@ public:
*/
wxDataViewCustomRenderer(const wxString& varianttype = "string",
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT );
int align = -1, bool no_init = false);
/**
Destructor.
@ -1471,7 +1469,7 @@ public:
/**
Return size required to show content.
*/
virtual wxSize GetSize();
virtual wxSize GetSize() const = 0;
/**
Overrride this so that the renderer can get the value
@ -1501,7 +1499,7 @@ public:
wxDataViewRenderer::SetValue was called
so that this instance knows what to render.
*/
virtual bool Render(wxRect cell, wxDC* dc, int state);
virtual bool Render(wxRect cell, wxDC* dc, int state) = 0;
/**
This method should be called from within Render()
@ -1587,7 +1585,7 @@ public:
/**
Returns the bitmap in the header of the column, if any.
*/
const wxBitmap GetBitmap();
const wxBitmap& GetBitmap() const;
/**
Returns the index of the column of the model, which this
@ -1766,12 +1764,12 @@ public:
/**
Calls the identical method from wxDataViewTreeStore.
*/
const wxIcon GetItemExpandedIcon(const wxDataViewItem& item) const;
const wxIcon& GetItemExpandedIcon(const wxDataViewItem& item) const;
/**
Calls the identical method from wxDataViewTreeStore.
*/
const wxIcon GetItemIcon(const wxDataViewItem& item) const;
const wxIcon& GetItemIcon(const wxDataViewItem& item) const;
/**
Calls the identical method from wxDataViewTreeStore.
@ -1933,12 +1931,12 @@ public:
/**
Returns the icon to display in expanded containers.
*/
const wxIcon GetItemExpandedIcon(const wxDataViewItem& item) const;
const wxIcon& GetItemExpandedIcon(const wxDataViewItem& item) const;
/**
Returns the icon of the item.
*/
const wxIcon GetItemIcon(const wxDataViewItem& item) const;
const wxIcon& GetItemIcon(const wxDataViewItem& item) const;
/**
Returns the text of the item.

8
interface/wx/datectrl.h
View File

@ -115,14 +115,14 @@ public:
@return @false if no range limits are currently set, @true if at least
one bound is set.
*/
bool GetRange(wxDateTime* dt1, wxDateTime dt2) const;
virtual bool GetRange(wxDateTime* dt1, wxDateTime* dt2) const = 0;
/**
Returns the currently selected. If there is no selection or the
selection is outside of the current range, an invalid object is
returned.
*/
wxDateTime GetValue() const;
virtual wxDateTime GetValue() const = 0;
/**
Sets the display format for the date in the control. See wxDateTime for
@ -143,7 +143,7 @@ public:
@remarks If the current value of the control is outside of the newly
set range bounds, the behaviour is undefined.
*/
void SetRange(const wxDateTime& dt1, const wxDateTime& dt2);
virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) = 0;
/**
Changes the current value of the control. The date should be valid and
@ -151,6 +151,6 @@ public:
Calling this method does not result in a date change event.
*/
void SetValue(const wxDateTime& dt);
virtual void SetValue(const wxDateTime& dt) = 0;
};

2
interface/wx/dateevt.h
View File

@ -22,7 +22,7 @@ public:
/**
Returns the date.
*/
const wxDateTime GetDate() const;
const wxDateTime& GetDate() const;
/**
Sets the date carried by the event, normally only used by the library

6
interface/wx/datstrm.h
View File

@ -34,7 +34,8 @@ public:
@param stream
The output stream.
*/
wxDataOutputStream(wxOutputStream& stream);
wxDataOutputStream(wxOutputStream& s,
const wxMBConv& conv = wxConvAuto(wxFONTENCODING_DEFAULT));
/**
Constructs a datastream object from an output stream. Only write
methods will be available. This constructor is only available in
@ -178,7 +179,8 @@ public:
@param stream
The input stream.
*/
wxDataInputStream(wxInputStream& stream);
wxDataInputStream(wxInputStream& s,
const wxMBConv& conv = wxConvAuto(wxFONTENCODING_DEFAULT));
/**
Constructs a datastream object from an input stream. Only read methods
will be available. This constructor is only available in Unicode builds

21
interface/wx/dc.h
View File

@ -483,7 +483,7 @@ public:
@see wxDC::SetBackground()
*/
const wxBrush GetBackground() const;
const wxBrush& GetBackground() const;
/**
Returns the current background mode: @c wxSOLID or @c wxTRANSPARENT.
@ -497,7 +497,7 @@ public:
@see wxDC::SetBrush()
*/
const wxBrush GetBrush() const;
const wxBrush& GetBrush() const;
/**
Gets the character height of the currently set font.
@ -532,7 +532,7 @@ public:
wxNullFont initially and only after calling SetFont() a valid font is
returned.
*/
const wxFont GetFont() const;
const wxFont& GetFont() const;
/**
Gets the current layout direction of the device context. On platforms
@ -613,7 +613,7 @@ public:
@see SetPen()
*/
const wxPen GetPen() const;
const wxPen& GetPen() const;
/**
Gets in @a colour the colour at the specified location. Not available
@ -673,7 +673,7 @@ public:
@see SetTextBackground()
*/
const wxColour GetTextBackground() const;
const wxColour& GetTextBackground() const;
//@{
/**
@ -714,14 +714,14 @@ public:
@see SetTextForeground()
*/
const wxColour GetTextForeground() const;
const wxColour& GetTextForeground() const;
/**
Gets the current user scale factor.
@see SetUserScale()
*/
void GetUserScale(double x, double y);
void GetUserScale(double* x, double* y) const;
//@{
/**
@ -752,10 +752,9 @@ public:
to use @a initialColour on the left part of the rectangle and
@a destColour on the right one.
*/
void GradientFillLinear(const wxRect& rect,
const wxColour& initialColour,
void GradientFillLinear(const wxRect& rect, const wxColour& initialColour,
const wxColour& destColour,
wxDirection nDirection = wxEAST);
wxDirection nDirection = wxRIGHT);
/**
Returns @true if the DC is ok to use.
@ -1012,7 +1011,7 @@ public:
/**
Starts a document page (only relevant when outputting to a printer).
*/
bool StartPage();
void StartPage();
/**
Copy from a source DC to this DC, specifying the destination

16
interface/wx/debugrpt.h
View File

@ -44,7 +44,7 @@ public:
chose to cancel report generation or removed all files from
it.
*/
virtual bool Show(wxDebugReport& dbgrpt) const;
virtual bool Show(wxDebugReport& dbgrpt) const = 0;
};
@ -71,7 +71,7 @@ public:
Returns the full path of the compressed file (empty if creation
failed).
*/
const wxString GetCompressedFileName() const;
const wxString& GetCompressedFileName() const;
};
@ -205,25 +205,25 @@ public:
This function may be overridden to add arbitrary custom context to the
XML context file created by AddContext(). By default, it does nothing.
*/
void DoAddCustomContext(wxXmlNode* nodeRoot);
virtual void DoAddCustomContext(wxXmlNode* nodeRoot);
/**
This function may be overridden to modify the contents of the exception
tag in the XML context file.
*/
bool DoAddExceptionInfo(wxXmlNode* nodeContext);
virtual bool DoAddExceptionInfo(wxXmlNode* nodeContext);
/**
This function may be overridden to modify the contents of the modules
tag in the XML context file.
*/
bool DoAddLoadedModules(wxXmlNode* nodeModules);
virtual bool DoAddLoadedModules(wxXmlNode* nodeModules);
/**
This function may be overridden to modify the contents of the system
tag in the XML context file.
*/
bool DoAddSystemInfo(wxXmlNode* nodeSystemInfo);
virtual bool DoAddSystemInfo(wxXmlNode* nodeSystemInfo);
/**
This method should be used to construct the full name of the files
@ -232,7 +232,7 @@ public:
@return The name of the temporary directory used for the files in this
report.
*/
const wxString GetDirectory() const;
const wxString& GetDirectory() const;
/**
Retrieves the name (relative to GetDirectory()) and the description of
@ -341,6 +341,6 @@ public:
returned. Value returned by this function becomes the return value of
wxDebugReport::Process().
*/
bool OnServerReply(const wxArrayString& reply);
virtual bool OnServerReply(const wxArrayString& reply);
};

13
interface/wx/dialog.h
View File

@ -207,9 +207,8 @@ public:
*/
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 wxSize& size = wxDefaultSize, long style = 536877056,
const wxString& name = wxDialogNameStr);
/**
Creates a sizer with standard buttons. @a flags is a bit list of the
@ -343,7 +342,7 @@ public:
@see @ref overview_dialog_autoscrolling (for more on layout adaptation)
*/
wxArrayInt GetMainButtonIds();
wxArrayInt& GetMainButtonIds();
/**
Gets the return code for this window.
@ -549,7 +548,7 @@ public:
otherwise the box is hidden. If @false and the dialog is modal,
control is returned to the calling program.
*/
bool Show(bool show);
virtual bool Show(bool show = 1);
/**
Shows a modal dialog.
@ -599,13 +598,13 @@ public:
/**
Override this to returns @true if adaptation can and should be done.
*/
bool CanDoLayoutAdaptation(wxDialog* dialog);
virtual bool CanDoLayoutAdaptation(wxDialog* dialog) = 0;
/**
Override this to perform layout adaptation, such as making parts of the
dialog scroll and resizing the dialog to fit the display. Normally this
function will be called just before the dialog is shown.
*/
bool DoLayoutAdaptation(wxDialog* dialog);
virtual bool DoLayoutAdaptation(wxDialog* dialog) = 0;
};

31
interface/wx/dialup.h
View File

@ -53,7 +53,7 @@ public:
@see IsDialing()
*/
bool CancelDialing();
virtual bool CancelDialing() = 0;
/**
This function should create and return the object of the
@ -80,16 +80,16 @@ public:
returns immediately - the result is reported via events (an event is
sent anyhow, but if dialing failed it will be a DISCONNECTED one).
*/
bool Dial(const wxString& nameOfISP = wxEmptyString,
const wxString& username = wxEmptyString,
const wxString& password = wxEmptyString,
bool async = true);
virtual bool Dial(const wxString& nameOfISP = wxEmptyString,
const wxString& username = wxEmptyString,
const wxString& password = wxEmptyString,
bool async = true) = 0;
/**
Disable automatic check for connection status change - notice that the
@c wxEVT_DIALUP_XXX events won't be sent any more neither.
*/
void DisableAutoCheckOnlineStatus();
virtual void DisableAutoCheckOnlineStatus() = 0;
/**
Enable automatic checks for the connection status and sending of
@ -102,7 +102,7 @@ public:
@return @false if couldn't set up automatic check for online status.
*/
bool EnableAutoCheckOnlineStatus(size_t nSeconds = 60);
virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds = 60) = 0;
/**
This function is only implemented under Windows.
@ -111,12 +111,12 @@ public:
parameter to Dial() on this machine and returns their number (may be
0).
*/
size_t GetISPNames(wxArrayString& names) const;
virtual size_t GetISPNames(wxArrayString& names) const = 0;
/**
Hang up the currently active dial up connection.
*/
bool HangUp();
virtual bool HangUp() = 0;
/**
Returns @true if the computer has a permanent network connection (i.e.
@ -127,14 +127,14 @@ public:
guaranteed to be correct, so it is better to ask user for
confirmation or give him a possibility to override it.
*/
bool IsAlwaysOnline() const;
virtual bool IsAlwaysOnline() const = 0;
/**
Returns @true if (async) dialing is in progress.
@see Dial()
*/
bool IsDialing() const;
virtual bool IsDialing() const = 0;
/**
Returns @true if the dialup manager was initialized correctly. If this
@ -142,7 +142,7 @@ public:
a good idea to call this function and check its result before calling
any other wxDialUpManager methods.
*/
bool IsOk() const;
virtual bool IsOk() const = 0;
/**
Returns @true if the computer is connected to the network: under
@ -150,7 +150,7 @@ public:
check that the "well-known host" (as specified by SetWellKnownHost())
is reachable.
*/
bool IsOnline() const;
virtual bool IsOnline() const = 0;
/**
This method is for Unix only.
@ -168,7 +168,7 @@ public:
@see IsOnline()
*/
void SetOnlineStatus(bool isOnline = true);
virtual void SetOnlineStatus(bool isOnline = true) = 0;
/**
This method is for Unix only.
@ -178,7 +178,8 @@ public:
function is always safe to call. The default value is
@c "www.yahoo.com:80".
*/
void SetWellKnownHost(const wxString& hostname, int portno = 80);
virtual void SetWellKnownHost(const wxString& hostname,
int portno = 80) = 0;
};

4
interface/wx/dir.h
View File

@ -68,7 +68,7 @@ public:
This is a pure virtual function and must be implemented in the derived
class.
*/
virtual wxDirTraverseResult OnDir(const wxString& dirname);
virtual wxDirTraverseResult OnDir(const wxString& dirname) = 0;
/**
This function is called for each file. It may return ::wxDIR_STOP to
@ -78,7 +78,7 @@ public:
This is a pure virtual function and must be implemented in the derived
class.
*/
virtual wxDirTraverseResult OnFile(const wxString& filename);
virtual wxDirTraverseResult OnFile(const wxString& filename) = 0;
/**
This function is called for each directory which we failed to open for

7
interface/wx/dirctrl.h
View File

@ -91,13 +91,12 @@ public:
Create function for two-step construction. See wxGenericDirCtrl() for
details.
*/
bool Create(wxWindow* parent, const wxWindowID id = -1,
bool Create(wxWindow* parent, const wxWindowID id = wxID_ANY,
const wxString& dir = wxDirDialogDefaultFolderStr,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_3D_INTERNAL|wxBORDER_SUNKEN,
const wxString& filter = wxEmptyString,
int defaultFilter = 0,
long style = wxDIRCTRL_3D_INTERNAL,
const wxString& filter = wxEmptyString, int defaultFilter = 0,
const wxString& name = wxTreeCtrlNameStr);
/**

2
interface/wx/display.h
View File

@ -27,7 +27,7 @@ public:
The index of the display to use. This must be non-negative and
lower than the value returned by GetCount().
*/
wxDisplay(unsigned index = 0);
wxDisplay(unsigned int n = 0);
/**
Destructor.

2
interface/wx/dnd.h
View File

@ -42,7 +42,7 @@ public:
Return @true to accept the data, or @false to veto the operation.
*/
virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& data);
virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& data) = 0;
};

2
interface/wx/docmdi.h
View File

@ -127,7 +127,7 @@ public:
to override (but still call) this function in order to set the keyboard
focus for your subwindow.
*/
void OnActivate(wxActivateEvent event);
void OnActivate(wxActivateEvent& event);
/**
Closes and deletes the current view and document.

37
interface/wx/docview.h
View File

@ -64,10 +64,9 @@ public:
wxDocTemplate(wxDocManager* manager, const wxString& descr,
const wxString& filter, const wxString& dir,
const wxString& ext, const wxString& docTypeName,
const wxString& viewTypeName,
wxClassInfo* docClassInfo = NULL,
wxClassInfo* viewClassInfo = NULL,
long flags = wxDEFAULT_TEMPLATE_FLAGS);
const wxString& viewTypeName, wxClassInfo* docClassInfo = 0,
wxClassInfo* viewClassInfo = 0,
long flags = wxTEMPLATE_VISIBLE);
/**
Destructor.
@ -346,7 +345,7 @@ public:
allowed for the document (by virtue of multiple templates mentioning
the same document type), a choice of view is presented to the user.
*/
wxView* CreateView(wxDocument* doc, long flags);
virtual wxView* CreateView(wxDocument* doc, long flags = 0);
/**
Removes the template from the list of templates.
@ -415,7 +414,7 @@ public:
/**
Returns a reference to the list of documents.
*/
wxList GetDocuments();
wxList& GetDocuments();
/**
Returns a pointer to file history.
@ -441,7 +440,7 @@ public:
/**
Returns a reference to the list of associated templates.
*/
wxList GetTemplates();
wxList& GetTemplates();
/**
Initializes data; currently just calls OnCreateFileHistory().
@ -528,9 +527,9 @@ public:
This function is used in CreateDocument().
*/
wxDocTemplate* SelectDocumentPath(wxDocTemplate** templates,
int noTemplates, wxString& path,
long flags, bool save);
virtual wxDocTemplate* SelectDocumentPath(wxDocTemplate** templates,
int noTemplates, wxString& path,
long flags, bool save = false);
/**
Returns a document template by asking the user (if there is more than
@ -758,7 +757,7 @@ public:
/**
Override this function to render the view on the given device context.
*/
virtual void OnDraw(wxDC* dc);
virtual void OnDraw(wxDC* dc) = 0;
/**
Called when the view should be updated.
@ -772,7 +771,7 @@ public:
application-specific information for making updating more
efficient.
*/
virtual void OnUpdate(wxView* sender, wxObject* hint);
virtual void OnUpdate(wxView* sender, wxObject* hint = 0);
/**
Associates the given document with the view. Normally called by the
@ -865,7 +864,7 @@ public:
override (but still call) this function in order to set the keyboard
focus for your subwindow.
*/
void OnActivate(wxActivateEvent event);
void OnActivate(wxActivateEvent& event);
/**
Closes and deletes the current view and document.
@ -935,12 +934,10 @@ public:
/**
Used in two-step construction.
*/
bool Create(wxDocManager* manager, wxFrame* parent,
wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = "frame");
bool Create(wxDocManager* manager, wxFrame* parent, wxWindowID id,
const wxString& title, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 541072960,
const wxString& name = wxFrameNameStr);
/**
Returns the associated document manager object.
@ -989,7 +986,7 @@ public:
Constructor. Define your own default constructor to initialize
application-specific data.
*/
wxDocument();
wxDocument(wxDocument* parent = 0);
/**
Destructor. Removes itself from the document manager.

4
interface/wx/dynlib.h
View File

@ -34,7 +34,7 @@ public:
@return @true if the load address and module size were retrieved,
@false if this information is not available.
*/
bool GetAddress(void** addr, size_t len) const;
bool GetAddress(void* addr, size_t* len) const;
/**
Returns the base name of this module, e.g. @c "kernel32.dll" or
@ -156,7 +156,7 @@ public:
@see wxDYNLIB_FUNCTION()
*/
void* GetSymbol(const wxString& name) const;
void* GetSymbol(const wxString& name, bool* success = 0) const;
/**
This function is available only under Windows as it is only useful when

4
interface/wx/filename.h
View File

@ -831,7 +831,7 @@ public:
@param perm
The permissions for the newly created directory.
See wxPosixPermissions enumeration for more info.
See the ::wxPosixPermissions enumeration for more info.
@param flags
If the flags contain @c wxPATH_MKDIR_FULL flag, try to create each
directory in the path and also don't return an error if the target
@ -849,7 +849,7 @@ public:
The directory to create
@param parm
The permissions for the newly created directory.
See wxPosixPermissions enumeration for more info.
See the ::wxPosixPermissions enumeration for more info.
@param flags
If the flags contain @c wxPATH_MKDIR_FULL flag, try to create each
directory in the path and also don't return an error if the target