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:
@@ -36,6 +36,11 @@ class wxFileSystem : public wxObject
|
||||
public:
|
||||
/**
|
||||
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();
|
||||
|
||||
@@ -172,7 +177,7 @@ public:
|
||||
@class wxFSFile
|
||||
|
||||
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).
|
||||
|
||||
@note Any pointer returned by a method of wxFSFile is valid only as long as
|
||||
@@ -182,7 +187,7 @@ public:
|
||||
ten identical pointers.
|
||||
|
||||
@library{wxbase}
|
||||
@category{vfs}
|
||||
@category{vfs,file}
|
||||
|
||||
@see wxFileSystemHandler, wxFileSystem, @ref overview_fs
|
||||
*/
|
||||
|
@@ -205,7 +205,7 @@ public:
|
||||
|
||||
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.
|
||||
|
@@ -1446,6 +1446,12 @@ public:
|
||||
wxImage& operator=(const wxImage& image);
|
||||
};
|
||||
|
||||
/**
|
||||
An instance of an empty image without an alpha channel.
|
||||
*/
|
||||
wxImage wxNullImage;
|
||||
|
||||
|
||||
// ============================================================================
|
||||
// Global functions/macros
|
||||
// ============================================================================
|
||||
|
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
enum wxLanguage
|
||||
{
|
||||
/// User's default/preffered language as got from OS.
|
||||
/// User's default/preferred language as got from OS.
|
||||
wxLANGUAGE_DEFAULT,
|
||||
|
||||
/// Unknown language, returned if wxLocale::GetSystemLanguage fails.
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: mediactrl.h
|
||||
// Purpose: interface of wxMediaEvent
|
||||
// Purpose: interface of wxMediaEvent, wxMediaCtrl
|
||||
// Author: wxWidgets team
|
||||
// RCS-ID: $Id$
|
||||
// Licence: wxWindows license
|
||||
|
@@ -31,6 +31,9 @@ enum wxXmlResourceFlags
|
||||
The class holds XML resources from one or more .xml files, binary files or zip
|
||||
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
|
||||
|
||||
@library{wxxrc}
|
||||
@@ -166,7 +169,14 @@ public:
|
||||
|
||||
/**
|
||||
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);
|
||||
|
||||
@@ -189,7 +199,7 @@ public:
|
||||
|
||||
@code
|
||||
MyDialog dlg;
|
||||
wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog");
|
||||
wxXmlResource::Get()->LoadDialog(&dlg, mainFrame, "my_dialog");
|
||||
dlg.ShowModal();
|
||||
@endcode
|
||||
*/
|
||||
|
Reference in New Issue
Block a user