Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

other ifacecheck fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-10 23:44:44 +00:00
parent f045ad8d25
commit 882678ebb4
22 changed files with 178 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
interface/wx/aui/framemanager.h
View File

@@ -203,8 +203,8 @@ public:
interface. If the lookup failed (meaning the pane could not be found in the
manager), a call to the returned wxAuiPaneInfo's IsOk() method will return @false.
*/
wxAuiPaneInfo GetPane(wxWindow* window);
wxAuiPaneInfo GetPane(const wxString& name);
wxAuiPaneInfo& GetPane(wxWindow* window);
wxAuiPaneInfo& GetPane(const wxString& name);
//@}
/**
@@ -366,8 +366,8 @@ public:
BestSize() sets the ideal size for the pane. The docking manager will attempt
to use this size as much as possible when docking or floating the pane.
*/
wxAuiPaneInfo BestSize(const wxSize& size);
wxAuiPaneInfo BestSize(int x, int y);
wxAuiPaneInfo& BestSize(const wxSize& size);
wxAuiPaneInfo& BestSize(int x, int y);
//@}
/**
@@ -479,16 +479,16 @@ public:
/**
FloatingPosition() sets the position of the floating pane.
*/
wxAuiPaneInfo FloatingPosition(const wxPoint& pos);
wxAuiPaneInfo FloatingPosition(int x, int y);
wxAuiPaneInfo& FloatingPosition(const wxPoint& pos);
wxAuiPaneInfo& FloatingPosition(int x, int y);
//@}
//@{
/**
FloatingSize() sets the size of the floating pane.
*/
wxAuiPaneInfo FloatingSize(const wxSize& size);
wxAuiPaneInfo FloatingSize(int x, int y);
wxAuiPaneInfo& FloatingSize(const wxSize& size);
wxAuiPaneInfo& FloatingSize(int x, int y);
//@}
/**
@@ -649,8 +649,8 @@ public:
/**
MaxSize() sets the maximum size of the pane.
*/
wxAuiPaneInfo MaxSize(const wxSize& size);
wxAuiPaneInfo MaxSize(int x, int y);
wxAuiPaneInfo& MaxSize(const wxSize& size);
wxAuiPaneInfo& MaxSize(int x, int y);
//@}
/**
@@ -663,8 +663,8 @@ public:
MinSize() sets the minimum size of the pane. Please note that this is only
partially supported as of this writing.
*/
wxAuiPaneInfo MinSize(const wxSize& size);
wxAuiPaneInfo MinSize(int x, int y);
wxAuiPaneInfo& MinSize(const wxSize& size);
wxAuiPaneInfo& MinSize(int x, int y);
//@}
/**

10
interface/wx/bmpbuttn.h
View File

@@ -147,7 +147,7 @@ public:
@see SetBitmapFocus()
*/
const wxBitmap& GetBitmapFocus() const;
wxBitmap& GetBitmapFocus();
wxBitmap& GetBitmapFocus();
//@}
//@{
@@ -156,8 +156,8 @@ public:
@see SetBitmapHover()
*/
const wxBitmap& GetBitmapHover();
wxBitmap& GetBitmapHover();
const wxBitmap& GetBitmapHover() const;
wxBitmap& GetBitmapHover();
//@}
//@{
@@ -168,8 +168,8 @@ public:
@see SetBitmapLabel()
*/
const wxBitmap& GetBitmapLabel();
wxBitmap& GetBitmapLabel();
const wxBitmap& GetBitmapLabel() const;
wxBitmap& GetBitmapLabel();
//@}
/**

2
interface/wx/brush.h
View File

@@ -173,7 +173,7 @@ public:
@see GetColour()
*/
virtual void SetColour(wxColour& colour);
virtual void SetColour(const wxColour& colour);
virtual void SetColour(unsigned char red, unsigned char green, unsigned char blue);
//@}

4
interface/wx/caret.h
View File

@@ -62,7 +62,7 @@ public:
Get the caret position (in pixels).
*/
void GetPosition(int* x, int* y) const;
const wxPoint GetPosition() const;
wxPoint GetPosition() const;
//@}
//@{
@@ -70,7 +70,7 @@ public:
Get the caret size.
*/
void GetSize(int* width, int* height) const;
const wxSize GetSize() const;
wxSize GetSize() const;
//@}
/**

55
interface/wx/choice.h
View File

@@ -73,13 +73,13 @@ public:
@endWxPythonOnly
*/
wxChoice(wxWindow* parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size, int n,
const wxString choices[],
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "choice");
wxChoice( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr );
/**
Constructor, creating and showing a choice.
@@ -111,13 +111,13 @@ public:
@endWxPythonOnly
*/
wxChoice(wxWindow* parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "choice");
wxChoice( wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr );
//@}
/**
@@ -129,19 +129,20 @@ public:
/**
Creates the choice for two-step construction. See wxChoice().
*/
bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos,
const wxSize& size, int n,
const wxString choices[],
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "choice");
bool Create(wxWindow* parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "choice");
bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr );
bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr );
//@}
/**

3
interface/wx/colour.h
View File

@@ -164,15 +164,12 @@ public:
*/
bool operator !=(const wxColour& colour) const;
//@{
/**
Assignment operator, using a colour name to be found in the colour database.
@see wxColourDatabase
*/
wxColour& operator=(const wxColour& colour);
wxColour& operator=(const wxColour& colour);
//@}
/**
Tests the equality of two colours by comparing individual red, green, blue

4
interface/wx/combobox.h
View File

@@ -106,7 +106,7 @@ public:
const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox");
const wxString& name = wxComboBoxNameStr);
/**
Constructor, creating and showing a combobox.
@@ -144,7 +144,7 @@ public:
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox");
const wxString& name = wxComboBoxNameStr);
//@}
/**

26
interface/wx/ctrlsub.h
View File

@@ -247,7 +247,7 @@ public:
@param items
Array of strings to insert.
*/
void Append(const wxArrayString& items);
int Append(const wxArrayString& items);
/**
Appends several items at once into the control.
@@ -261,7 +261,7 @@ public:
Array of client data pointers of the same size as @a items to
associate with the new items.
*/
void Append(const wxArrayString& items, void **clientData);
int Append(const wxArrayString& items, void **clientData);
/**
Appends several items at once into the control.
@@ -275,7 +275,7 @@ public:
Array of client data pointers of the same size as @a items to
associate with the new items.
*/
void Append(const wxArrayString& items, wxClientData **clientData);
int Append(const wxArrayString& items, wxClientData **clientData);
/**
Appends several items at once into the control.
@@ -288,7 +288,7 @@ public:
@param items
Array of strings of size @a n.
*/
void Append(unsigned int n, const wxString* items);
int Append(unsigned int n, const wxString* items);
/**
Appends several items at once into the control.
@@ -304,8 +304,8 @@ public:
Array of client data pointers of size @a n to associate with the
new items.
*/
void Append(unsigned int n, const wxString* items,
void** clientData);
int Append(unsigned int n, const wxString* items,
void** clientData);
/**
Appends several items at once into the control.
@@ -321,7 +321,7 @@ public:
Array of client data pointers of size @a n to associate with the
new items.
*/
void Append(unsigned int n, const wxString* items,
int Append(unsigned int n, const wxString* items,
wxClientData** clientData);
//@}
@@ -463,7 +463,7 @@ public:
@param pos
Position to insert the items before, zero based.
*/
void Insert(const wxArrayString& items, unsigned int pos);
int Insert(const wxArrayString& items, unsigned int pos);
/**
Inserts several items at once into the control.
@@ -479,7 +479,7 @@ public:
Array of client data pointers of the same size as @a items to
associate with the new items.
*/
void Insert(const wxArrayString& items, unsigned int pos,
int Insert(const wxArrayString& items, unsigned int pos,
void **clientData);
/**
@@ -496,7 +496,7 @@ public:
Array of client data pointers of the same size as @a items to
associate with the new items.
*/
void Insert(const wxArrayString& items, unsigned int pos,
int Insert(const wxArrayString& items, unsigned int pos,
wxClientData **clientData);
/**
@@ -512,7 +512,7 @@ public:
@param pos
Position to insert the items before, zero based.
*/
void Insert(unsigned int n, const wxString* items,
int Insert(unsigned int n, const wxString* items,
unsigned int pos);
/**
@@ -531,7 +531,7 @@ public:
Array of client data pointers of size @a n to associate with the
new items.
*/
void Insert(unsigned int n, const wxString* items,
int Insert(unsigned int n, const wxString* items,
unsigned int pos,
void** clientData);
@@ -551,7 +551,7 @@ public:
Array of client data pointers of size @a n to associate with the
new items.
*/
void Insert(unsigned int n, const wxString* items,
int Insert(unsigned int n, const wxString* items,
unsigned int pos,
wxClientData** clientData);
//@}

18
interface/wx/dataview.h
View File

@@ -742,13 +742,13 @@ public:
unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
int width = -1,
wxAlignment align = wxALIGN_CENTER,
wxAlignment align = wxALIGN_NOT,
int flags = wxDATAVIEW_COL_RESIZABLE);
wxDataViewColumn* AppendDateColumn(const wxBitmap& label,
unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
int width = -1,
wxAlignment align = wxALIGN_CENTER,
wxAlignment align = wxALIGN_NOT,
int flags = wxDATAVIEW_COL_RESIZABLE);
//@}
@@ -765,13 +765,13 @@ public:
unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int width = -1,
wxAlignment align = wxALIGN_LEFT,
wxAlignment align = wxALIGN_NOT,
int flags = wxDATAVIEW_COL_RESIZABLE);
wxDataViewColumn* AppendIconTextColumn(const wxBitmap& label,
unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int width = -1,
wxAlignment align = wxALIGN_LEFT,
wxAlignment align = wxALIGN_NOT,
int flags = wxDATAVIEW_COL_RESIZABLE);
//@}
@@ -809,13 +809,13 @@ public:
unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int width = -1,
wxAlignment align = wxALIGN_LEFT,
wxAlignment align = wxALIGN_NOT,
int flags = wxDATAVIEW_COL_RESIZABLE);
wxDataViewColumn* AppendTextColumn(const wxBitmap& label,
unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int width = -1,
wxAlignment align = wxALIGN_LEFT,
wxAlignment align = wxALIGN_NOT,
int flags = wxDATAVIEW_COL_RESIZABLE);
//@}
@@ -1558,13 +1558,13 @@ public:
wxDataViewRenderer* renderer,
unsigned int model_column,
int width = wxDVC_DEFAULT_WIDTH,
wxAlignment align = wxALIGN_CENTRE,
wxAlignment align = wxALIGN_CENTER,
int flags = wxDATAVIEW_COL_RESIZABLE);
wxDataViewColumn(const wxBitmap& bitmap,
wxDataViewRenderer* renderer,
unsigned int model_column,
int width = wxDVC_DEFAULT_WIDTH,
wxAlignment align = wxALIGN_CENTRE,
wxAlignment align = wxALIGN_CENTER,
int flags = wxDATAVIEW_COL_RESIZABLE);
//@}
@@ -1706,7 +1706,7 @@ public:
/**
Returns the store.
*/
wxDataViewTreeStore* GetStore() const;
wxDataViewTreeStore* GetStore();
const wxDataViewTreeStore* GetStore() const;
//@}

14
interface/wx/datetime.h
View File

@@ -248,13 +248,13 @@ public:
This constructor is named "wxDateTimeFromTimeT" in wxPython.
@endWxPythonOnly
*/
wxDateTime& wxDateTime(time_t timet);
wxDateTime(time_t timet);
/**
Same as Set().
@beginWxPythonOnly Unsupported. @endWxPythonOnly
*/
wxDateTime& wxDateTime(const struct tm& tm);
wxDateTime(const struct tm& tm);
/**
Same as Set().
@@ -262,7 +262,7 @@ public:
This constructor is named "wxDateTimeFromJDN" in wxPython.
@endWxPythonOnly
*/
wxDateTime& wxDateTime(double jdn);
wxDateTime(double jdn);
/**
Same as Set().
@@ -270,8 +270,8 @@ public:
This constructor is named "wxDateTimeFromHMS" in wxPython.
@endWxPythonOnly
*/
wxDateTime& wxDateTime(wxDateTime_t hour, wxDateTime_t minute = 0,
wxDateTime_t second = 0, wxDateTime_t millisec = 0);
wxDateTime(wxDateTime_t hour, wxDateTime_t minute = 0,
wxDateTime_t second = 0, wxDateTime_t millisec = 0);
/**
Same as Set().
@@ -1388,7 +1388,7 @@ public:
Returns the current time broken down using the buffer whose adress is
passed to the function with @a tm to store the result.
*/
static struct tm* GetTmNow(struct tm *tm);
static tm* GetTmNow(struct tm *tm);
/**
Returns the current time broken down. Note that this function returns a
@@ -1397,7 +1397,7 @@ public:
your code might be used in a multi-threaded application, you really
should use GetTmNow(struct tm *) instead.
*/
static struct tm* GetTmNow();
static tm* GetTmNow();
/**
Gets the full (default) or abbreviated (specify @c Name_Abbr) name of

10
interface/wx/dc.h
View File

@@ -267,10 +267,10 @@ public:
character with the given index if it is != -1 and return the bounding
rectangle if required.
*/
virtual void DrawLabel(const wxString& text, const wxBitmap& image,
const wxRect& rect,
int alignment = wxALIGN_LEFT | wxALIGN_TOP,
int indexAccel = -1, wxRect* rectBounding = NULL);
void DrawLabel(const wxString& text, const wxBitmap& image,
const wxRect& rect,
int alignment = wxALIGN_LEFT | wxALIGN_TOP,
int indexAccel = -1, wxRect* rectBounding = NULL);
void DrawLabel(const wxString& text, const wxRect& rect,
int alignment = wxALIGN_LEFT | wxALIGN_TOP,
int indexAccel = -1);
@@ -1132,7 +1132,7 @@ public:
*/
wxDCClipper(wxDC& dc, const wxRegion& r);
wxDCClipper(wxDC& dc, const wxRect& rect);
wxDCClipper(wxDC& dc, int x, int y, int w, int h);
wxDCClipper(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h);
//@}
/**

4
interface/wx/dcbuffer.h
View File

@@ -87,7 +87,7 @@ public:
window is buffered, or wxBUFFER_VIRTUAL_AREA to indicate that the
buffer bitmap covers the virtual area.
*/
wxBufferedDC(wxDC* dc, wxBitmap& buffer,
wxBufferedDC(wxDC* dc, wxBitmap& buffer = wxNullBitmap,
int style = wxBUFFER_CLIENT_AREA);
//@}
@@ -104,7 +104,7 @@ public:
*/
void Init(wxDC* dc, const wxSize& area,
int style = wxBUFFER_CLIENT_AREA);
void Init(wxDC* dc, wxBitmap& buffer,
void Init(wxDC* dc, wxBitmap& buffer = wxNullBitmap,
int style = wxBUFFER_CLIENT_AREA);
//@}
};

2
interface/wx/docview.h
View File

@@ -1134,7 +1134,7 @@ public:
@see GetFirstView()
*/
wxList& GetViews() const;
wxList& GetViews();
const wxList& GetViews() const;
//@}

13
interface/wx/filename.h
View File

@@ -384,6 +384,7 @@ public:
*/
void ClearExt();
//@{
/**
Returns a temporary file name starting with the given @e prefix.
If the @a prefix is an absolute path, the temporary file is created in this
@@ -408,6 +409,9 @@ public:
*/
static wxString CreateTempFileName(const wxString& prefix,
wxFile* fileTemp = NULL);
static wxString CreateTempFileName(const wxString& prefix,
wxFFile* fileTemp = NULL);
//@}
/**
Returns @true if the directory with this name exists.
@@ -617,7 +621,7 @@ public:
not be read (because e.g. the file is locked by another process) the returned
value is ::wxInvalidSize.
*/
const static wxULongLong GetSize(const wxString& filename);
static wxULongLong GetSize(const wxString& filename);
/**
Returns the directory used for temporary files.
@@ -1066,18 +1070,19 @@ public:
trailing dot, but empty. If you need to cope with such cases, you should use
@a hasExt instead of relying on testing whether @a ext is empty or not.
*/
static void SplitPath(const wxString& fullpath, wxString* volume,
static void SplitPath(const wxString& fullpath,
wxString* volume,
wxString* path,
wxString* name,
wxString* ext,
bool hasExt = NULL,
bool* hasExt = NULL,
wxPathFormat format = wxPATH_NATIVE);
static void SplitPath(const wxString& fullpath,
wxString* volume,
wxString* path,
wxString* name,
wxString* ext,
wxPathFormat format = wxPATH_NATIVE);
wxPathFormat format);
static void SplitPath(const wxString& fullpath,
wxString* path,
wxString* name,

50
interface/wx/filesys.h
View File

@@ -383,6 +383,32 @@ public:
*/
virtual wxString FindNext();
/**
Returns the MIME type based on @b extension of @a location.
(While wxFSFile::GetMimeType() returns real MIME type - either
extension-based or queried from HTTP.)
Example:
@code
GetMimeTypeFromExt("index.htm") == "text/html"
@endcode
*/
static wxString GetMimeTypeFromExt(const wxString& location);
/**
Opens the file and returns wxFSFile pointer or @NULL if failed.
Must be overridden in derived handlers.
@param fs
Parent FS (the FS from that OpenFile was called).
See the ZIP handler for details of how to use it.
@param location
The absolute location of file.
*/
virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) = 0;
protected:
/**
Returns the anchor if present in the location.
See wxFSFile::GetAnchor for details.
@@ -406,18 +432,6 @@ public:
*/
static wxString GetLeftLocation(const wxString& location);
/**
Returns the MIME type based on @b extension of @a location.
(While wxFSFile::GetMimeType() returns real MIME type - either
extension-based or queried from HTTP.)
Example:
@code
GetMimeTypeFromExt("index.htm") == "text/html"
@endcode
*/
static wxString GetMimeTypeFromExt(const wxString& location);
/**
Returns the protocol string extracted from @a location.
@@ -437,17 +451,5 @@ public:
@endcode
*/
static wxString GetRightLocation(const wxString& location);
/**
Opens the file and returns wxFSFile pointer or @NULL if failed.
Must be overridden in derived handlers.
@param fs
Parent FS (the FS from that OpenFile was called).
See the ZIP handler for details of how to use it.
@param location
The absolute location of file.
*/
virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) = 0;
};

8
interface/wx/font.h
View File

@@ -310,7 +310,7 @@ public:
@remarks If the desired font does not exist, the closest match will be
chosen. Under Windows, only scalable TrueType fonts are used.
*/
wxFont(int pointSize, wxFontFamily family, int style,
wxFont(int pointSize, wxFontFamily family, wxFontStyle style,
wxFontWeight weight,
bool underline = false,
const wxString& faceName = wxEmptyString,
@@ -360,7 +360,7 @@ public:
chosen. Under Windows, only scalable TrueType fonts are used.
*/
wxFont(const wxSize& pixelSize, wxFontFamily family,
int style, wxFontWeight weight,
wxFontStyle style, wxFontWeight weight,
bool underline = false,
const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
@@ -473,7 +473,7 @@ public:
Using @c New() is currently the only way to directly create a font with
the given size in pixels on platforms other than wxMSW.
*/
static wxFont* New(int pointSize, wxFontFamily family, int style,
static wxFont* New(int pointSize, wxFontFamily family, wxFontStyle style,
wxFontWeight weight,
bool underline = false,
const wxString& faceName = wxEmptyString,
@@ -484,7 +484,7 @@ public:
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
static wxFont* New(const wxSize& pixelSize,
wxFontFamily family,
int style,
wxFontStyle style,
wxFontWeight weight,
bool underline = false,
const wxString& faceName = wxEmptyString,

81
interface/wx/grid.h
View File

@@ -1665,7 +1665,7 @@ public:
See wxGridTableBase::CanGetValueAs() and the @ref overview_grid for
more information.
*/
const wxString& GetCellValue(const wxGridCellCoords& coords) const;
wxString GetCellValue(const wxGridCellCoords& coords) const;
/**
Returns a pointer to the current default grid cell editor.
@@ -2770,7 +2770,7 @@ public:
@see BlockToDeviceRect()
*/
const wxRect CellToRect(const wxGridCellCoords& coords) const;
wxRect CellToRect(const wxGridCellCoords& coords) const;
/**
Returns the column at the given pixel position.
@@ -3098,44 +3098,6 @@ public:
//@}
protected:
/**
Returns @true if this grid has support for cell attributes.
The grid supports attributes if it has the associated table which, in
turn, has attributes support, i.e. wxGridTableBase::CanHaveAttributes()
returns @true.
*/
bool CanHaveAttributes() const;
/**
Get the minimal width of the given column/row.
The value returned by this function may be different than that returned
by GetColMinimalAcceptableWidth() if SetColMinimalWidth() had been
called for this column.
*/
int GetColMinimalWidth(int col) const;
/**
Returns the coordinate of the right border specified column.
*/
int GetColRight(int col) const;
/**
Returns the coordinate of the left border specified column.
*/
int GetColLeft(int col) const;
/**
Returns the minimal size for the given column.
The value returned by this function may be different than that returned
by GetRowMinimalAcceptableHeight() if SetRowMinimalHeight() had been
called for this row.
*/
int GetRowMinimalHeight(int col) const;
/**
@name Sorting support.
@@ -3207,6 +3169,7 @@ protected:
void UnsetSortingColumn();
//@}
/**
@name Accessors for component windows.
@@ -3271,6 +3234,44 @@ protected:
wxHeaderCtrl *GetGridColHeader() const;
//@}
protected:
/**
Returns @true if this grid has support for cell attributes.
The grid supports attributes if it has the associated table which, in
turn, has attributes support, i.e. wxGridTableBase::CanHaveAttributes()
returns @true.
*/
bool CanHaveAttributes() const;
/**
Get the minimal width of the given column/row.
The value returned by this function may be different than that returned
by GetColMinimalAcceptableWidth() if SetColMinimalWidth() had been
called for this column.
*/
int GetColMinimalWidth(int col) const;
/**
Returns the coordinate of the right border specified column.
*/
int GetColRight(int col) const;
/**
Returns the coordinate of the left border specified column.
*/
int GetColLeft(int col) const;
/**
Returns the minimal size for the given column.
The value returned by this function may be different than that returned
by GetRowMinimalAcceptableHeight() if SetRowMinimalHeight() had been
called for this row.
*/
int GetRowMinimalHeight(int col) const;
};

4
interface/wx/mimetype.h
View File

@@ -340,8 +340,8 @@ public:
indicate that an error occurred (typically meaning that there is no standard way
to open this kind of files).
*/
bool GetOpenCommand(wxString* command, MessageParameters& params);
wxString GetOpenCommand(const wxString& filename);
bool GetOpenCommand(wxString* command, const MessageParameters& params);
wxString GetOpenCommand(const wxString& filename) const;
//@}
/**

4
interface/wx/protocol/http.h
View File

@@ -27,8 +27,8 @@ public:
You may connect to a non-default port by specifying it explicitly using
the second overload.
*/
bool Connect(const wxString& host);
bool Connect(const wxString& host, unsigned short port);
virtual bool Connect(const wxString& host);
virtual bool Connect(const wxString& host, unsigned short port);
//@}
/**

5
interface/wx/richtext/richtextctrl.h
View File

@@ -1363,7 +1363,6 @@ public:
bool SetStyle(long start, long end, const wxTextAttr& style);
//@}
//@{
/**
Sets the attributes for the given range, passing flags to determine how the
attributes are set.
@@ -1394,10 +1393,6 @@ public:
virtual bool SetStyleEx(const wxRichTextRange& range,
const wxTextAttr& style,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
virtual bool SetStyleEx(const wxRichTextRange& range,
const wxTextAttr& style,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
//@}
/**
Sets the style sheet associated with the control.

3
interface/wx/richtext/richtextstyles.h
View File

@@ -510,15 +510,12 @@ public:
*/
bool IsNumbered(int level) const;
//@{
/**
Sets the style for the given level. @a level is a number between 0 and 9.
The first and most flexible form uses a wxTextAttr object, while the second
form is for convenient setting of the most commonly-used attributes.
*/
void SetLevelAttributes(int level, const wxTextAttr& attr);
void SetLevelAttributes(int i, const wxTextAttr& attr);
//@}
};

10
interface/wx/stream.h
View File

@@ -504,7 +504,7 @@ enum wxStreamProtocolType
@code
factory = wxFilterClassFactory::Find(filename, wxSTREAM_FILEEXT);
if (factory)
stream = factory-NewStream(new wxFFileInputStream(filename));
stream = factory->NewStream(new wxFFileInputStream(filename));
@endcode
wxFilterClassFactory::Find can also search for a factory by MIME type,
@@ -595,10 +595,10 @@ public:
If the parent stream is passed as a pointer then the new filter stream
takes ownership of it. If it is passed by reference then it does not.
*/
wxFilterInputStream* NewStream(wxInputStream& stream) const;
wxFilterOutputStream* NewStream(wxOutputStream& stream) const;
wxFilterInputStream* NewStream(wxInputStream* stream) const;
wxFilterOutputStream* NewStream(wxOutputStream* stream) const;
virtual wxFilterInputStream* NewStream(wxInputStream& stream) const = 0;
virtual wxFilterOutputStream* NewStream(wxOutputStream& stream) const = 0;
virtual wxFilterInputStream* NewStream(wxInputStream* stream) const = 0;
virtual wxFilterOutputStream* NewStream(wxOutputStream* stream) const = 0;
//@}
/**