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

Merge in from trunk r64802 - r68625

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-10 18:10:42 +00:00
parent 3baf235f60 cbef7338c1
commit 94e0018723
97 changed files with 2524 additions and 1712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interface/wx/animate.h
View File

@@ -228,11 +228,17 @@ public:
/**
Returns the i-th frame as a wxImage.
This method is not implemented in the native wxGTK implementation of
this class and always returns an invalid image there.
*/
virtual wxImage GetFrame(unsigned int i) const;
/**
Returns the number of frames for this animation.
This method is not implemented in the native wxGTK implementation of
this class and always returns 0 there.
*/
virtual unsigned int GetFrameCount() const;

29
interface/wx/app.h
View File

@@ -569,7 +569,7 @@ public:
Under Windows and Linux/Unix, you should parse the command line
arguments and check for files to be opened when starting your
application. Under OS X, you need to override MacOpenFile()
application. Under OS X, you need to override MacOpenFiles()
since command line arguments are used differently there.
You may use the wxCmdLineParser to parse command line arguments.
@@ -802,16 +802,35 @@ public:
*/
virtual void MacNewFile();
/**
Called in response of an openFiles message with Cocoa, or an
"open-document" Apple event with Carbon.
You need to override this method in order to open one or more document
files after the user double clicked on it or if the files and/or
folders were dropped on either the application in the dock or the
application icon in Finder.
By default this method calls MacOpenFile for each file/folder.
@onlyfor{wxosx}
@since 2.9.3
*/
virtual void MacOpenFiles(const wxArrayString& fileNames);
/**
Called in response of an "open-document" Apple event.
You need to override this method in order to open a document file after the
user double clicked on it or if the document file was dropped on either the
running application or the application icon in Finder.
@deprecated
This function is kept mostly for backwards compatibility. Please
override wxApp::MacOpenFiles method instead in any new code.
@onlyfor{wxosx}
*/
virtual void MacOpenFile(const wxString& fileName);
wxDEPRECATED_BUT_USED_INTERNALLY(
virtual void MacOpenFile(const wxString& fileName)
);
/**
Called in response of a "get-url" Apple event.

5
interface/wx/dataview.h
View File

@@ -421,7 +421,7 @@ public:
unsigned int col) const;
/**
Returns the number of items (i.e. rows) in the list.
Returns the number of items (or rows) in the list.
*/
unsigned int GetCount() const;
@@ -614,8 +614,9 @@ public:
/**
Constructor.
*/
wxDataViewItem(void* id = NULL);
wxDataViewItem();
wxDataViewItem(const wxDataViewItem& item);
explicit wxDataViewItem(void* id);
//@}
/**

28
interface/wx/msgdlg.h
View File

@@ -22,6 +22,12 @@
Puts Yes and No buttons in the message box. It is recommended to always
use @c wxCANCEL with this style as otherwise the message box won't have
a close button under wxMSW and the user will be forced to answer it.
@style{wxHELP}
Puts a Help button to the message box. This button can have special
appearance or be specially positioned if its label is not changed from
the default one. Notice that using this button is not supported when
showing a message box from non-main thread in wxOSX/Cocoa and it is not
supported in wxOSX/Carbon at all. @since 2.9.3.
@style{wxNO_DEFAULT}
Makes the "No" button default, can only be used with @c wxYES_NO.
@style{wxCANCEL_DEFAULT}
@@ -116,6 +122,19 @@ public:
*/
virtual void SetExtendedMessage(const wxString& extendedMessage);
/**
Sets the label for the Help button.
Please see the remarks in SetYesNoLabels() documentation.
Notice that changing the label of the help button resets its special
status (if any, this depends on the platform) and it will be treated
just like another button in this case.
@since 2.9.3
*/
virtual bool SetHelpLabel(const ButtonLabel& help);
/**
Sets the message shown by the dialog.
@@ -190,7 +209,8 @@ public:
virtual bool SetYesNoLabels(const ButtonLabel& yes, const ButtonLabel& no);
/**
Shows the dialog, returning one of wxID_OK, wxID_CANCEL, wxID_YES, wxID_NO.
Shows the dialog, returning one of wxID_OK, wxID_CANCEL, wxID_YES,
wxID_NO or wxID_HELP.
Notice that this method returns the identifier of the button which was
clicked unlike wxMessageBox() function.
@@ -215,9 +235,9 @@ public:
extended text and custom labels for the message box buttons, are not
provided by this function but only by wxMessageDialog.
The return value is one of: @c wxYES, @c wxNO, @c wxCANCEL or @c wxOK
(notice that this return value is @b different from the return value of
wxMessageDialog::ShowModal()).
The return value is one of: @c wxYES, @c wxNO, @c wxCANCEL, @c wxOK or @c
wxHELP (notice that this return value is @b different from the return value
of wxMessageDialog::ShowModal()).
For example:
@code

11
interface/wx/stdpaths.h
View File

@@ -12,6 +12,13 @@
wxStandardPaths returns the standard locations in the file system and should be
used by applications to find their data files in a portable way.
Note that you must not create objects of class wxStandardPaths directly,
but use the global standard paths object returned by wxStandardPaths::Get()
(which can be of a type derived from wxStandardPaths and not of exactly
this type) and call the methods you need on it. The object returned by
Get() may be customized by overriding wxAppTraits::GetStandardPaths()
methods.
In the description of the methods below, the example return values are given
for the Unix, Windows and Mac OS X systems, however please note that these are
just the examples and the actual values may differ. For example, under Windows:
@@ -42,10 +49,6 @@
This class is MT-safe: its methods may be called concurrently from different
threads without additional locking.
Note that you don't allocate an instance of class wxStandardPaths, but retrieve the
global standard paths object using @c wxStandardPaths::Get on which you call the
desired methods.
@library{wxbase}
@category{file}

43
interface/wx/textctrl.h
View File

@@ -220,11 +220,6 @@ public:
bool Apply(const wxTextAttr& style,
const wxTextAttr* compareWith = NULL);
/**
Creates a font from the font attributes.
*/
wxFont CreateFont() const;
/**
Copies all defined/valid properties from overlay to current object.
*/
@@ -1197,19 +1192,15 @@ public:
/**
Returns the number of lines in the text control buffer.
The returned number is the number of logical lines, i.e. just the count
of the number of newline characters in the control + 1, for wxGTK and
wxOSX/Cocoa ports while it is the number of physical lines, i.e. the
count of lines actually shown in the control, in wxMSW and wxOSX/Carbon.
Because of this discrepancy, it is not recommended to use this function.
@remarks
Note that even empty text controls have one line (where the
insertion point is), so GetNumberOfLines() never returns 0.
For wxGTK using GTK+ 1.2.x and earlier, the number of lines in a
multi-line text control is calculated by actually counting newline
characters in the buffer, i.e. this function returns the number of
logical lines and doesn't depend on whether any of them are wrapped.
For all the other platforms, the number of physical lines in the
control is returned.
Also note that you may wish to avoid using functions that work with
line numbers if you are working with controls that contain large
amounts of text as this function has O(N) complexity for N being
the number of lines.
*/
virtual int GetNumberOfLines() const;
@@ -1348,6 +1339,28 @@ public:
*/
virtual bool PositionToXY(long pos, long* x, long* y) const;
/**
Converts given text position to client coordinates in pixels.
This function allows to find where is the character at the given
position displayed in the text control.
@onlyfor{wxmsw,wxgtk}. Additionally, wxGTK only implements this method
for multiline controls and ::wxDefaultPosition is always returned for
the single line ones.
@param pos
Text position in 0 to GetLastPosition() range (inclusive).
@return
On success returns a wxPoint which contains client coordinates for
the given position in pixels, otherwise returns ::wxDefaultPosition.
@since 2.9.3
@see XYToPosition(), PositionToXY()
*/
wxPoint PositionToCoords(long pos) const;
/**
Saves the contents of the control in a text file.

27
interface/wx/toplevel.h
View File

@@ -262,6 +262,33 @@ public:
*/
virtual void Maximize(bool maximize = true);
/**
MSW-specific function for accessing the system menu.
Returns a wxMenu pointer representing the system menu of the window
under MSW. The returned wxMenu may be used, if non-@c NULL, to add
extra items to the system menu. The usual @c wxEVT_COMMAND_MENU_SELECTED
events (that can be processed using @c EVT_MENU event table macro) will
then be generated for them. All the other wxMenu methods may be used as
well but notice that they won't allow you to access any standard system
menu items (e.g. they can't be deleted or modified in any way
currently).
Notice that because of the native system limitations the identifiers of
the items added to the system menu must be multiples of 16, otherwise
no events will be generated for them.
The returned pointer must @em not be deleted, it is owned by the window
and will be only deleted when the window itself is destroyed.
This function is not available in the other ports by design, any
occurrences of it in the portable code must be guarded by @code #ifdef
__WXMSW__ @endcode preprocessor guards.
@since 2.9.3
*/
wxMenu *MSWGetSystemMenu() const;
/**
Use a system-dependent way to attract users attention to the window when
it is in background.