miscellaneous small enhancements

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-10 18:59:37 +00:00
parent 7712257ef2
commit 336aecf1c2
6 changed files with 28 additions and 7 deletions

View File

@@ -36,6 +36,11 @@ class wxFileSystem : public wxObject
public: public:
/** /**
Constructor. Constructor.
The initial current path of this object will be empty
(i.e. GetPath() == wxEmptyString) which means that e.g. OpenFile()
or FindFirst() functions will use current working directory as
current path (see also wxGetCwd).
*/ */
wxFileSystem(); wxFileSystem();
@@ -172,7 +177,7 @@ public:
@class wxFSFile @class wxFSFile
This class represents a single file opened by wxFileSystem. This class represents a single file opened by wxFileSystem.
It provides more information than wxWindow's input stream It provides more informations than wxWidgets' input streams
(stream, filename, mime type, anchor). (stream, filename, mime type, anchor).
@note Any pointer returned by a method of wxFSFile is valid only as long as @note Any pointer returned by a method of wxFSFile is valid only as long as
@@ -182,7 +187,7 @@ public:
ten identical pointers. ten identical pointers.
@library{wxbase} @library{wxbase}
@category{vfs} @category{vfs,file}
@see wxFileSystemHandler, wxFileSystem, @ref overview_fs @see wxFileSystemHandler, wxFileSystem, @ref overview_fs
*/ */

View File

@@ -205,7 +205,7 @@ public:
wxHtmlHelpController ignores this call. wxHtmlHelpController ignores this call.
*/ */
virtual bool LoadFile(const wxString& file = ""); virtual bool LoadFile(const wxString& file = wxEmptyString);
/** /**
Overrideable member called when this application's viewer is quit by the user. Overrideable member called when this application's viewer is quit by the user.

View File

@@ -1446,6 +1446,12 @@ public:
wxImage& operator=(const wxImage& image); wxImage& operator=(const wxImage& image);
}; };
/**
An instance of an empty image without an alpha channel.
*/
wxImage wxNullImage;
// ============================================================================ // ============================================================================
// Global functions/macros // Global functions/macros
// ============================================================================ // ============================================================================

View File

@@ -17,7 +17,7 @@
*/ */
enum wxLanguage enum wxLanguage
{ {
/// User's default/preffered language as got from OS. /// User's default/preferred language as got from OS.
wxLANGUAGE_DEFAULT, wxLANGUAGE_DEFAULT,
/// Unknown language, returned if wxLocale::GetSystemLanguage fails. /// Unknown language, returned if wxLocale::GetSystemLanguage fails.

View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: mediactrl.h // Name: mediactrl.h
// Purpose: interface of wxMediaEvent // Purpose: interface of wxMediaEvent, wxMediaCtrl
// Author: wxWidgets team // Author: wxWidgets team
// RCS-ID: $Id$ // RCS-ID: $Id$
// Licence: wxWindows license // Licence: wxWindows license

View File

@@ -31,6 +31,9 @@ enum wxXmlResourceFlags
The class holds XML resources from one or more .xml files, binary files or zip The class holds XML resources from one or more .xml files, binary files or zip
archive files. archive files.
Note that this is a singleton class and you'll never allocate/deallocate it.
Just use the static wxXmlResource::Get() getter.
@see @ref overview_xrc, @ref overview_xrcformat @see @ref overview_xrc, @ref overview_xrcformat
@library{wxxrc} @library{wxxrc}
@@ -166,7 +169,14 @@ public:
/** /**
Loads resources from XML files that match given filemask. Loads resources from XML files that match given filemask.
This method understands VFS (see filesys.h).
Example:
@code
if (!wxXmlResource::Get()->Load("rc/*.xrc"))
wxLogError("Couldn't load resources!");
@endcode
This method understands VFS (see wxFileSystem::FindFirst).
*/ */
bool Load(const wxString& filemask); bool Load(const wxString& filemask);
@@ -189,7 +199,7 @@ public:
@code @code
MyDialog dlg; MyDialog dlg;
wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog"); wxXmlResource::Get()->LoadDialog(&dlg, mainFrame, "my_dialog");
dlg.ShowModal(); dlg.ShowModal();
@endcode @endcode
*/ */