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

adjusted indentation with astyle; added Id keyword

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-03-08 14:43:31 +00:00
parent aa6ec1d787
commit 7c913512a4
269 changed files with 9052 additions and 9058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
interface/aboutdlg.h
View File

@@ -44,9 +44,7 @@ class wxAboutDialogInfo
public: public:
/** /**
Default constructor leaves all fields are initially uninitialized, in general Default constructor leaves all fields are initially uninitialized, in general
you should call at least SetVersion(), you should call at least SetVersion(), SetCopyright() and SetDescription().
SetCopyright() and
SetDescription().
*/ */
wxAboutDialogInfo(); wxAboutDialogInfo();
@@ -73,10 +71,10 @@ public:
/** /**
Adds a translator name to be shown in the program credits. Notice that if no Adds a translator name to be shown in the program credits. Notice that if no
translator names are specified explicitely, wxAboutBox translator names are specified explicitely, wxAboutBox will try to use the
will try to use the translation of the string @c translator-credits from translation of the string @c translator-credits from the currently used message
the currently used message catalog -- this can be used to show just the name of catalog -- this can be used to show just the name of the translator of the
the translator of the program in the current language. program in the current language.
@sa SetTranslators() @sa SetTranslators()
*/ */
@@ -90,8 +88,8 @@ public:
void SetArtists(const wxArrayString& artists); void SetArtists(const wxArrayString& artists);
/** /**
Set the short string containing the program copyright information. Notice that Set the short string containing the program copyright information. Notice
any occurrences of @c "(C)" in @e copyright will be replaced by the that any occurrences of @c "(C)" in @e copyright will be replaced by the
copyright symbol (circled C) automatically, which means that you can avoid copyright symbol (circled C) automatically, which means that you can avoid
using this symbol in the program source code which can be problematic, using this symbol in the program source code which can be problematic,
*/ */
@@ -148,16 +146,14 @@ public:
void SetName(const wxString& name); void SetName(const wxString& name);
/** /**
Set the list of translators. Please see Set the list of translators. Please see AddTranslator() for additional
AddTranslator() for additional
discussion. discussion.
*/ */
void SetTranslators(const wxArrayString& translators); void SetTranslators(const wxArrayString& translators);
/** /**
Set the version of the program. The version is in free format, i.e. not Set the version of the program. The version is in free format, i.e. not
necessarily in the @c x.y.z form but it shouldn't contain the "version" necessarily in the @c x.y.z form but it shouldn't contain the "version" word.
word.
*/ */
void SetVersion(const wxString& version); void SetVersion(const wxString& version);
@@ -214,8 +210,7 @@ void wxAboutBox(const wxAboutDialogInfo& info);
supported). supported).
See the @ref overview_sampledialogs "dialogs sample" for an example of about See the @ref overview_sampledialogs "dialogs sample" for an example of about
dialog dialog customization.
customization.
@sa wxAboutDialogInfo @sa wxAboutDialogInfo
*/ */

8
interface/accel.h
View File

@@ -37,7 +37,7 @@ public:
The menu or control command identifier. The menu or control command identifier.
*/ */
wxAcceleratorEntry(); wxAcceleratorEntry();
wxAcceleratorEntry(int flags, int keyCode, int cmd); wxAcceleratorEntry(int flags, int keyCode, int cmd);
//@} //@}
/** /**
@@ -113,9 +113,9 @@ public:
Name of a Windows accelerator. Name of a Windows accelerator.
*/ */
wxAcceleratorTable(); wxAcceleratorTable();
wxAcceleratorTable(const wxAcceleratorTable& bitmap); wxAcceleratorTable(const wxAcceleratorTable& bitmap);
wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); wxAcceleratorTable(int n, wxAcceleratorEntry entries[]);
wxAcceleratorTable(const wxString& resource); wxAcceleratorTable(const wxString& resource);
//@} //@}
/** /**

6
interface/animate.h
View File

@@ -191,9 +191,9 @@ public:
See LoadFile for more info. See LoadFile for more info.
*/ */
wxAnimation(); wxAnimation();
wxAnimation(const wxAnimation& anim); wxAnimation(const wxAnimation& anim);
wxAnimation(const wxString& name, wxAnimation(const wxString& name,
wxAnimationType type = wxANIMATION_TYPE_ANY); wxAnimationType type = wxANIMATION_TYPE_ANY);
//@} //@}
/** /**

54
interface/app.h
View File

@@ -627,7 +627,7 @@ public:
default (but it can be changed). default (but it can be changed).
*/ */
void wxLogMessage(const char * formatString, ... ); void wxLogMessage(const char * formatString, ... );
void wxVLogMessage(const char * formatString, va_list argPtr); void wxVLogMessage(const char * formatString, va_list argPtr);
//@} //@}
//@{ //@{
@@ -638,7 +638,7 @@ void wxLogMessage(const char * formatString, ... );
wxLogInfo). wxLogInfo).
*/ */
void wxLogVerbose(const char * formatString, ... ); void wxLogVerbose(const char * formatString, ... );
void wxVLogVerbose(const char * formatString, va_list argPtr); void wxVLogVerbose(const char * formatString, va_list argPtr);
//@} //@}
/** /**
@@ -668,7 +668,7 @@ void wxExit();
the program work. the program work.
*/ */
void wxLogWarning(const char * formatString, ... ); void wxLogWarning(const char * formatString, ... );
void wxVLogWarning(const char * formatString, va_list argPtr); void wxVLogWarning(const char * formatString, va_list argPtr);
//@} //@}
//@{ //@{
@@ -678,8 +678,8 @@ void wxLogWarning(const char * formatString, ... );
function also terminates the program with this exit code. function also terminates the program with this exit code.
*/ */
void wxLogFatalError(const char * formatString, ... ); void wxLogFatalError(const char * formatString, ... );
void wxVLogFatalError(const char * formatString, void wxVLogFatalError(const char * formatString,
va_list argPtr); va_list argPtr);
//@} //@}
/** /**
@@ -741,7 +741,7 @@ void wxPostEvent(wxEvtHandler * dest, wxEvent& event);
user about it. user about it.
*/ */
void wxLogError(const char * formatString, ... ); void wxLogError(const char * formatString, ... );
void wxVLogError(const char * formatString, va_list argPtr); void wxVLogError(const char * formatString, va_list argPtr);
//@} //@}
//@{ //@{
@@ -792,16 +792,16 @@ void wxLogError(const char * formatString, ... );
wxTraceOleCalls: trace OLE method calls (Win32 only) wxTraceOleCalls: trace OLE method calls (Win32 only)
*/ */
void wxLogTrace(const char * formatString, ... ); void wxLogTrace(const char * formatString, ... );
void wxVLogTrace(const char * formatString, va_list argPtr); void wxVLogTrace(const char * formatString, va_list argPtr);
void wxLogTrace(const char * mask, const char * formatString, void wxLogTrace(const char * mask, const char * formatString,
... ); ... );
void wxVLogTrace(const char * mask, void wxVLogTrace(const char * mask,
const char * formatString, const char * formatString,
va_list argPtr); va_list argPtr);
void wxLogTrace(wxTraceMask mask, const char * formatString, void wxLogTrace(wxTraceMask mask, const char * formatString,
... ); ... );
void wxVLogTrace(wxTraceMask mask, const char * formatString, void wxVLogTrace(wxTraceMask mask, const char * formatString,
va_list argPtr); va_list argPtr);
//@} //@}
/** /**
@@ -826,7 +826,7 @@ void wxUninitialize();
nothing in release mode (otherwise). nothing in release mode (otherwise).
*/ */
void wxLogDebug(const char * formatString, ... ); void wxLogDebug(const char * formatString, ... );
void wxVLogDebug(const char * formatString, va_list argPtr); void wxVLogDebug(const char * formatString, va_list argPtr);
//@} //@}
/** /**
@@ -852,10 +852,10 @@ wxAppDerivedClass wxGetApp();
*/ */
void wxLogStatus(wxFrame * frame, const char * formatString, void wxLogStatus(wxFrame * frame, const char * formatString,
... ); ... );
void wxVLogStatus(wxFrame * frame, const char * formatString, void wxVLogStatus(wxFrame * frame, const char * formatString,
va_list argPtr); va_list argPtr);
void wxLogStatus(const char * formatString, ... ); void wxLogStatus(const char * formatString, ... );
void wxVLogStatus(const char * formatString, va_list argPtr); void wxVLogStatus(const char * formatString, va_list argPtr);
//@} //@}
/** /**
@@ -905,8 +905,8 @@ bool wxYield();
@sa wxSysErrorCode, wxSysErrorMsg @sa wxSysErrorCode, wxSysErrorMsg
*/ */
void wxLogSysError(const char * formatString, ... ); void wxLogSysError(const char * formatString, ... );
void wxVLogSysError(const char * formatString, void wxVLogSysError(const char * formatString,
va_list argPtr); va_list argPtr);
//@} //@}
//@{ //@{
@@ -929,9 +929,9 @@ void wxLogSysError(const char * formatString, ... );
@sa wxEntryStart @sa wxEntryStart
*/ */
int wxEntry(int& argc, wxChar ** argv); int wxEntry(int& argc, wxChar ** argv);
int wxEntry(HINSTANCE hInstance, int wxEntry(HINSTANCE hInstance,
HINSTANCE hPrevInstance = @NULL, HINSTANCE hPrevInstance = @NULL,
char * pCmdLine = @NULL, char * pCmdLine = @NULL,
int nCmdShow = SW_SHOWNORMAL); int nCmdShow = SW_SHOWNORMAL);
//@} //@}

188
interface/archive.h
View File

@@ -154,7 +154,7 @@ public:
data can then be written by writing to this wxArchiveOutputStream. data can then be written by writing to this wxArchiveOutputStream.
*/ */
bool PutNextEntry(wxArchiveEntry* entry); bool PutNextEntry(wxArchiveEntry* entry);
bool PutNextEntry(const wxString& name); bool PutNextEntry(const wxString& name);
//@} //@}
}; };
@@ -188,7 +188,7 @@ public:
The entry's timestamp. The entry's timestamp.
*/ */
wxDateTime GetDateTime(); wxDateTime GetDateTime();
void SetDateTime(const wxDateTime& dt); void SetDateTime(const wxDateTime& dt);
//@} //@}
//@{ //@{
@@ -202,8 +202,8 @@ public:
Similarly, setting a name with a trailing path separator sets IsDir(). Similarly, setting a name with a trailing path separator sets IsDir().
*/ */
wxString GetName(wxPathFormat format = wxPATH_NATIVE); wxString GetName(wxPathFormat format = wxPATH_NATIVE);
void SetName(const wxString& name, void SetName(const wxString& name,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
//@} //@}
//@{ //@{
@@ -211,7 +211,7 @@ public:
The size of the entry's data in bytes. The size of the entry's data in bytes.
*/ */
off_t GetSize(); off_t GetSize();
void SetSize(off_t size); void SetSize(off_t size);
//@} //@}
/** /**
@@ -250,7 +250,7 @@ public:
restore files, even if the archive contains no explicit directory entries. restore files, even if the archive contains no explicit directory entries.
*/ */
bool IsDir(); bool IsDir();
void SetIsDir(bool isDir = @true); void SetIsDir(bool isDir = @true);
//@} //@}
//@{ //@{
@@ -258,7 +258,7 @@ public:
True if the entry is a read-only file. True if the entry is a read-only file.
*/ */
bool IsReadOnly(); bool IsReadOnly();
void SetIsReadOnly(bool isReadOnly = @true); void SetIsReadOnly(bool isReadOnly = @true);
//@} //@}
//@{ //@{
@@ -274,7 +274,7 @@ public:
non-seekable streams). non-seekable streams).
*/ */
void SetNotifier(wxArchiveNotifier& notifier); void SetNotifier(wxArchiveNotifier& notifier);
void UnsetNotifier(); void UnsetNotifier();
//@} //@}
}; };
@@ -329,7 +329,7 @@ public:
can be a complete filename rather than just an extension. can be a complete filename rather than just an extension.
*/ */
static const wxArchiveClassFactory* Find(const wxChar* protocol, static const wxArchiveClassFactory* Find(const wxChar* protocol,
wxStreamProtocolType type = wxSTREAM_PROTOCOL); wxStreamProtocolType type = wxSTREAM_PROTOCOL);
//@{ //@{
/** /**
@@ -338,7 +338,7 @@ public:
constructor, is wxConvLocal. constructor, is wxConvLocal.
*/ */
wxMBConv GetConv(); wxMBConv GetConv();
void SetConv(wxMBConv& conv); void SetConv(wxMBConv& conv);
//@} //@}
//@{ //@{
@@ -350,7 +350,7 @@ public:
are available. They do not give away ownership of the factory. are available. They do not give away ownership of the factory.
*/ */
static const wxArchiveClassFactory* GetFirst(); static const wxArchiveClassFactory* GetFirst();
const wxArchiveClassFactory* GetNext(); const wxArchiveClassFactory* GetNext();
//@} //@}
/** /**
@@ -390,9 +390,9 @@ public:
takes ownership of it. If it is passed by reference then it does not. takes ownership of it. If it is passed by reference then it does not.
*/ */
wxArchiveInputStream* NewStream(wxInputStream& stream); wxArchiveInputStream* NewStream(wxInputStream& stream);
wxArchiveOutputStream* NewStream(wxOutputStream& stream); wxArchiveOutputStream* NewStream(wxOutputStream& stream);
wxArchiveInputStream* NewStream(wxInputStream* stream); wxArchiveInputStream* NewStream(wxInputStream* stream);
wxArchiveOutputStream* NewStream(wxOutputStream* stream); wxArchiveOutputStream* NewStream(wxOutputStream* stream);
//@} //@}
/** /**
@@ -480,110 +480,110 @@ public:
wxArchiveIterator(Arc& arc) { wxArchiveIterator(Arc& arc) {
/* ... */ /* ... */
}; };
@endcode @endcode
The first template parameter should be the type of archive input stream The first template parameter should be the type of archive input stream
(e.g. wxArchiveInputStream) and the (e.g. wxArchiveInputStream) and the
second can either be a pointer to an entry second can either be a pointer to an entry
(e.g. wxArchiveEntry*), or a string/pointer pair (e.g. wxArchiveEntry*), or a string/pointer pair
(e.g. std::pairwxString, wxArchiveEntry*). (e.g. std::pairwxString, wxArchiveEntry*).
The @c wx/archive.h header defines the following typedefs: The @c wx/archive.h header defines the following typedefs:
@code @code
typedef wxArchiveIteratorwxArchiveInputStream wxArchiveIter; typedef wxArchiveIteratorwxArchiveInputStream wxArchiveIter;
typedef wxArchiveIteratorwxArchiveInputStream, typedef wxArchiveIteratorwxArchiveInputStream,
std::pairwxString, wxArchiveEntry* wxArchivePairIter; std::pairwxString, wxArchiveEntry* wxArchivePairIter;
@endcode @endcode
The header for any implementation of this interface should define similar The header for any implementation of this interface should define similar
typedefs for its types, for example in @c wx/zipstrm.h there is: typedefs for its types, for example in @c wx/zipstrm.h there is:
@code @code
typedef wxArchiveIteratorwxZipInputStream wxZipIter; typedef wxArchiveIteratorwxZipInputStream wxZipIter;
typedef wxArchiveIteratorwxZipInputStream, typedef wxArchiveIteratorwxZipInputStream,
std::pairwxString, wxZipEntry* wxZipPairIter; std::pairwxString, wxZipEntry* wxZipPairIter;
@endcode @endcode
Transferring the catalogue of an archive @e arc to a vector @e cat, Transferring the catalogue of an archive @e arc to a vector @e cat,
can then be done something like this: can then be done something like this:
@code @code
std::vectorwxArchiveEntry* cat((wxArchiveIter)arc, wxArchiveIter()); std::vectorwxArchiveEntry* cat((wxArchiveIter)arc, wxArchiveIter());
@endcode @endcode
When the iterator is dereferenced, it gives away ownership of an entry When the iterator is dereferenced, it gives away ownership of an entry
object. So in the above example, when you have finished with @e cat object. So in the above example, when you have finished with @e cat
you must delete the pointers it contains. you must delete the pointers it contains.
If you have smart pointers with normal copy semantics (i.e. not auto_ptr If you have smart pointers with normal copy semantics (i.e. not auto_ptr
or wxScopedPtr), then you can create an iterator or wxScopedPtr), then you can create an iterator
which uses them instead. For example, with a smart pointer class for which uses them instead. For example, with a smart pointer class for
zip entries @e ZipEntryPtr: zip entries @e ZipEntryPtr:
@code @code
typedef std::vectorZipEntryPtr ZipCatalog; typedef std::vectorZipEntryPtr ZipCatalog;
typedef wxArchiveIteratorwxZipInputStream, ZipEntryPtr ZipIter; typedef wxArchiveIteratorwxZipInputStream, ZipEntryPtr ZipIter;
ZipCatalog cat((ZipIter)zip, ZipIter()); ZipCatalog cat((ZipIter)zip, ZipIter());
@endcode @endcode
Iterators that return std::pair objects can be used to Iterators that return std::pair objects can be used to
populate a std::multimap, to allow entries to be looked populate a std::multimap, to allow entries to be looked
up by name. The string is initialised using the wxArchiveEntry object's up by name. The string is initialised using the wxArchiveEntry object's
wxArchiveEntry::GetInternalName function. wxArchiveEntry::GetInternalName function.
@code @code
typedef std::multimapwxString, wxZipEntry* ZipCatalog; typedef std::multimapwxString, wxZipEntry* ZipCatalog;
ZipCatalog cat((wxZipPairIter)zip, wxZipPairIter()); ZipCatalog cat((wxZipPairIter)zip, wxZipPairIter());
@endcode @endcode
Note that this iterator also gives away ownership of an entry Note that this iterator also gives away ownership of an entry
object each time it is dereferenced. So in the above example, when object each time it is dereferenced. So in the above example, when
you have finished with @e cat you must delete the pointers it contains. you have finished with @e cat you must delete the pointers it contains.
Or if you have them, a pair containing a smart pointer can be used Or if you have them, a pair containing a smart pointer can be used
(again @e ZipEntryPtr), no worries about ownership: (again @e ZipEntryPtr), no worries about ownership:
@code @code
typedef std::multimapwxString, ZipEntryPtr ZipCatalog; typedef std::multimapwxString, ZipEntryPtr ZipCatalog;
typedef wxArchiveIteratorwxZipInputStream, typedef wxArchiveIteratorwxZipInputStream,
std::pairwxString, ZipEntryPtr ZipPairIter; std::pairwxString, ZipEntryPtr ZipPairIter;
ZipCatalog cat((ZipPairIter)zip, ZipPairIter()); ZipCatalog cat((ZipPairIter)zip, ZipPairIter());
@endcode @endcode
@library{wxbase} @library{wxbase}
@category{FIXME} @category{FIXME}
@seealso @seealso
wxArchiveEntry, wxArchiveInputStream, wxArchiveOutputStream wxArchiveEntry, wxArchiveInputStream, wxArchiveOutputStream
*/ */
class wxArchiveIterator class wxArchiveIterator
{ {
public: public:
//@{ //@{
/** /**
Construct iterator that returns all the entries in the archive input Construct iterator that returns all the entries in the archive input
stream @e arc. stream @e arc.
*/ */
wxArchiveIterator(); wxArchiveIterator();
wxArchiveIterator(Arc& arc); wxArchiveIterator(Arc& arc);
//@} //@}
/** /**
Returns an entry object from the archive input stream, giving away Returns an entry object from the archive input stream, giving away
ownership. ownership.
*/ */
const T operator*(); const T operator*();
//@{ //@{
/** /**
Position the input iterator at the next entry in the archive input stream. Position the input iterator at the next entry in the archive input stream.
*/ */
wxArchiveIterator operator++(); wxArchiveIterator operator++();
wxArchiveIterator operator++(int ); wxArchiveIterator operator++(int );
//@} //@}
}; };

13
interface/arrstr.h
View File

@@ -63,10 +63,10 @@ public:
Constructor from a wxString array. Pass a size @e sz and array @e arr. Constructor from a wxString array. Pass a size @e sz and array @e arr.
*/ */
wxArrayString(); wxArrayString();
wxArrayString(const wxArrayString& array); wxArrayString(const wxArrayString& array);
wxArrayString(size_t sz, const char** arr); wxArrayString(size_t sz, const char** arr);
wxArrayString(size_t sz, const wchar_t** arr); wxArrayString(size_t sz, const wchar_t** arr);
wxArrayString(size_t sz, const wxString* arr); wxArrayString(size_t sz, const wxString* arr);
//@} //@}
/** /**
@@ -201,7 +201,8 @@ public:
second one. second one.
*/ */
void Sort(bool reverseOrder = @false); void Sort(bool reverseOrder = @false);
Warning: void Sort(CompareFunction compareFunction); Warning:
void Sort(CompareFunction compareFunction);
//@} //@}
/** /**
@@ -251,7 +252,7 @@ public:
*/ */
wxArrayString wxSplit(const wxString& str, const wxChar sep, wxArrayString wxSplit(const wxString& str, const wxChar sep,
const wxChar escape = ' const wxChar escape = '
'); ');
/** /**
Concatenate all lines of the given wxArrayString object using the separator @e Concatenate all lines of the given wxArrayString object using the separator @e

4
interface/artprov.h
View File

@@ -233,8 +233,8 @@ public:
static wxIcon GetIcon(const wxArtID& id, static wxIcon GetIcon(const wxArtID& id,
const wxArtClient& client = wxART_OTHER, const wxArtClient& client = wxART_OTHER,
const wxSize& size = wxDefaultSize); const wxSize& size = wxDefaultSize);
static wxSize GetSizeHint(const wxArtClient& client, static wxSize GetSizeHint(const wxArtClient& client,
bool platform_default = @false); bool platform_default = @false);
//@} //@}
/** /**

17
interface/atomic.h
View File

@@ -1,15 +1,14 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: atomic.h // Name: atomic.h
// Purpose: documentation for global functions // Purpose: documentation for global functions
// Author: wxWidgets team // Author: wxWidgets team
// RCS-ID: $Id$ // RCS-ID: $Id$
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** /**
This function increments @e value in an atomic manner. This function increments @e value in an atomic manner.
*/ */
void wxAtomicInc(wxAtomicInt& value); void wxAtomicInc(wxAtomicInt& value);

28
interface/aui/aui.h
View File

@@ -74,11 +74,11 @@ public:
several versions of this function. The first version allows the full spectrum of pane parameter possibilities. The second version is used for simpler user interfaces which do not require as much configuration. The last version allows a drop position to be specified, which will determine where the pane will be added. several versions of this function. The first version allows the full spectrum of pane parameter possibilities. The second version is used for simpler user interfaces which do not require as much configuration. The last version allows a drop position to be specified, which will determine where the pane will be added.
*/ */
bool AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info); bool AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info);
bool AddPane(wxWindow* window, int direction = wxLEFT, bool AddPane(wxWindow* window, int direction = wxLEFT,
const wxString& caption = wxEmptyString); const wxString& caption = wxEmptyString);
bool AddPane(wxWindow* window, bool AddPane(wxWindow* window,
const wxAuiPaneInfo& pane_info, const wxAuiPaneInfo& pane_info,
const wxPoint& drop_pos); const wxPoint& drop_pos);
//@} //@}
/** /**
@@ -141,7 +141,7 @@ public:
returned wxAuiPaneInfo's IsOk() method will return @false. returned wxAuiPaneInfo's IsOk() method will return @false.
*/ */
wxAuiPaneInfo GetPane(wxWindow* window); wxAuiPaneInfo GetPane(wxWindow* window);
wxAuiPaneInfo GetPane(const wxString& name); wxAuiPaneInfo GetPane(const wxString& name);
//@} //@}
/** /**
@@ -288,7 +288,7 @@ public:
Copy constructor. Copy constructor.
*/ */
wxAuiPaneInfo(); wxAuiPaneInfo();
wxAuiPaneInfo(const wxAuiPaneInfo& c); wxAuiPaneInfo(const wxAuiPaneInfo& c);
//@} //@}
//@{ //@{
@@ -297,7 +297,7 @@ public:
to use this size as much as possible when docking or floating the pane. to use this size as much as possible when docking or floating the pane.
*/ */
wxAuiPaneInfo BestSize(const wxSize& size); wxAuiPaneInfo BestSize(const wxSize& size);
wxAuiPaneInfo BestSize(int x, int y); wxAuiPaneInfo BestSize(int x, int y);
//@} //@}
/** /**
@@ -332,7 +332,7 @@ public:
This is the same thing as calling Direction(wxAUI_DOCK_CENTRE). This is the same thing as calling Direction(wxAUI_DOCK_CENTRE).
*/ */
wxAuiPaneInfo Centre(); wxAuiPaneInfo Centre();
wxAuiPaneInfo Center(); wxAuiPaneInfo Center();
//@} //@}
//@{ //@{
@@ -341,7 +341,7 @@ public:
settings. Centre panes usually do not have caption bars. This function provides an easy way of preparing a pane to be displayed in the center dock position. settings. Centre panes usually do not have caption bars. This function provides an easy way of preparing a pane to be displayed in the center dock position.
*/ */
wxAuiPaneInfo CentrePane(); wxAuiPaneInfo CentrePane();
wxAuiPaneInfo CenterPane(); wxAuiPaneInfo CenterPane();
//@} //@}
/** /**
@@ -405,7 +405,7 @@ public:
FloatingPosition() sets the position of the floating pane. FloatingPosition() sets the position of the floating pane.
*/ */
wxAuiPaneInfo FloatingPosition(const wxPoint& pos); wxAuiPaneInfo FloatingPosition(const wxPoint& pos);
wxAuiPaneInfo FloatingPosition(int x, int y); wxAuiPaneInfo FloatingPosition(int x, int y);
//@} //@}
//@{ //@{
@@ -413,7 +413,7 @@ public:
FloatingSize() sets the size of the floating pane. FloatingSize() sets the size of the floating pane.
*/ */
wxAuiPaneInfo FloatingSize(const wxSize& size); wxAuiPaneInfo FloatingSize(const wxSize& size);
wxAuiPaneInfo FloatingSize(int x, int y); wxAuiPaneInfo FloatingSize(int x, int y);
//@} //@}
/** /**
@@ -573,7 +573,7 @@ public:
MaxSize() sets the maximum size of the pane. MaxSize() sets the maximum size of the pane.
*/ */
wxAuiPaneInfo MaxSize(const wxSize& size); wxAuiPaneInfo MaxSize(const wxSize& size);
wxAuiPaneInfo MaxSize(int x, int y); wxAuiPaneInfo MaxSize(int x, int y);
//@} //@}
/** /**
@@ -587,7 +587,7 @@ public:
partially supported as of this writing. partially supported as of this writing.
*/ */
wxAuiPaneInfo MinSize(const wxSize& size); wxAuiPaneInfo MinSize(const wxSize& size);
wxAuiPaneInfo MinSize(int x, int y); wxAuiPaneInfo MinSize(int x, int y);
//@} //@}
/** /**

10
interface/aui/auibook.h
View File

@@ -67,10 +67,10 @@ public:
Constructor. Creates a wxAuiNotebok control. Constructor. Creates a wxAuiNotebok control.
*/ */
wxAuiNotebook(); wxAuiNotebook();
wxAuiNotebook(wxWindow* parent, wxWindowID id = wxID_ANY, wxAuiNotebook(wxWindow* parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxAUI_NB_DEFAULT_STYLE); long style = wxAUI_NB_DEFAULT_STYLE);
//@} //@}
/** /**
@@ -228,7 +228,7 @@ public:
of the following: wxTOP, wxBOTTOM, wxLEFT, or wxRIGHT. of the following: wxTOP, wxBOTTOM, wxLEFT, or wxRIGHT.
*/ */
void SetUniformBitmapSize(const wxSize& size); void SetUniformBitmapSize(const wxSize& size);
void Split(size_t page, int direction); void Split(size_t page, int direction);
//@} //@}
/** /**

40
interface/base64.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: base64.h // Name: base64.h
// Purpose: documentation for global functions // Purpose: documentation for global functions
// Author: wxWidgets team // Author: wxWidgets team
// RCS-ID: $Id$ // RCS-ID: $Id$
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
//@{ //@{
/** /**
These functions encode the given data using base64. The first of them is the These functions encode the given data using base64. The first of them is the
raw encoding function writing the output string into provided buffer while the raw encoding function writing the output string into provided buffer while the
@@ -32,15 +32,15 @@
size_t wxBase64Encode(char * dst, size_t dstLen, size_t wxBase64Encode(char * dst, size_t dstLen,
const void * src, const void * src,
size_t srcLen); size_t srcLen);
wxString wxBase64Encode(const void * src, size_t srcLen); wxString wxBase64Encode(const void * src, size_t srcLen);
wxString wxBase64Encode(const wxMemoryBuffer& buf); wxString wxBase64Encode(const wxMemoryBuffer& buf);
//@} //@}
/** /**
Returns the size of the buffer necessary to contain the data encoded in a Returns the size of the buffer necessary to contain the data encoded in a
base64 string of length @e srcLen. This can be useful for allocating a base64 string of length @e srcLen. This can be useful for allocating a
buffer to be passed to wxBase64Decode. buffer to be passed to wxBase64Decode.
*/ */
size_t wxBase64DecodedSize(size_t srcLen); size_t wxBase64DecodedSize(size_t srcLen);
@@ -100,12 +100,12 @@ size_t wxBase64Decode(void * dst, size_t dstLen,
size_t srcLen = wxNO_LEN, size_t srcLen = wxNO_LEN,
wxBase64DecodeMode mode = wxBase64DecodeMode_Strict, wxBase64DecodeMode mode = wxBase64DecodeMode_Strict,
size_t posErr = @NULL); size_t posErr = @NULL);
wxMemoryBuffer wxBase64Decode(const char * src, wxMemoryBuffer wxBase64Decode(const char * src,
size_t srcLen = wxNO_LEN, size_t srcLen = wxNO_LEN,
wxBase64DecodeMode mode = wxBase64DecodeMode_Strict, wxBase64DecodeMode mode = wxBase64DecodeMode_Strict,
size_t posErr = @NULL); size_t posErr = @NULL);
wxMemoryBuffer wxBase64Decode(const wxString& src, wxMemoryBuffer wxBase64Decode(const wxString& src,
wxBase64DecodeMode mode = wxBase64DecodeMode_Strict, wxBase64DecodeMode mode = wxBase64DecodeMode_Strict,
size_t posErr = @NULL); size_t posErr = @NULL);
//@} //@}

42
interface/bitmap.h
View File

@@ -271,15 +271,15 @@ public:
@sa LoadFile() @sa LoadFile()
*/ */
wxBitmap(); wxBitmap();
wxBitmap(const wxBitmap& bitmap); wxBitmap(const wxBitmap& bitmap);
wxBitmap(const void* data, int type, int width, int height, wxBitmap(const void* data, int type, int width, int height,
int depth = -1); int depth = -1);
wxBitmap(const char bits[], int width, int height, wxBitmap(const char bits[], int width, int height,
int depth = 1); int depth = 1);
wxBitmap(int width, int height, int depth = -1); wxBitmap(int width, int height, int depth = -1);
wxBitmap(const char* const* bits); wxBitmap(const char* const* bits);
wxBitmap(const wxString& name, long type); wxBitmap(const wxString& name, long type);
wxBitmap(const wxImage& img, int depth = -1); wxBitmap(const wxImage& img, int depth = -1);
//@} //@}
/** /**
@@ -352,9 +352,9 @@ public:
@sa wxBitmap() @sa wxBitmap()
*/ */
virtual bool Create(int width, int height, int depth = -1); virtual bool Create(int width, int height, int depth = -1);
virtual bool Create(const void* data, int type, int width, virtual bool Create(const void* data, int type, int width,
int height, int height,
int depth = -1); int depth = -1);
//@} //@}
//@{ //@{
@@ -375,9 +375,9 @@ public:
@sa wxBitmapHandler @sa wxBitmapHandler
*/ */
static wxBitmapHandler* FindHandler(const wxString& name); static wxBitmapHandler* FindHandler(const wxString& name);
static wxBitmapHandler* FindHandler(const wxString& extension, static wxBitmapHandler* FindHandler(const wxString& extension,
wxBitmapType bitmapType); wxBitmapType bitmapType);
static wxBitmapHandler* FindHandler(wxBitmapType bitmapType); static wxBitmapHandler* FindHandler(wxBitmapType bitmapType);
//@} //@}
/** /**
@@ -664,10 +664,10 @@ public:
Index into a palette, specifying the transparency colour. Index into a palette, specifying the transparency colour.
*/ */
wxMask(); wxMask();
wxMask(const wxBitmap& bitmap); wxMask(const wxBitmap& bitmap);
wxMask(const wxBitmap& bitmap, wxMask(const wxBitmap& bitmap,
const wxColour& colour); const wxColour& colour);
wxMask(const wxBitmap& bitmap, int index); wxMask(const wxBitmap& bitmap, int index);
//@} //@}
/** /**
@@ -691,7 +691,7 @@ public:
Index into a palette, specifying the transparency colour. Index into a palette, specifying the transparency colour.
*/ */
bool Create(const wxBitmap& bitmap); bool Create(const wxBitmap& bitmap);
bool Create(const wxBitmap& bitmap, const wxColour& colour); bool Create(const wxBitmap& bitmap, const wxColour& colour);
bool Create(const wxBitmap& bitmap, int index); bool Create(const wxBitmap& bitmap, int index);
//@} //@}
}; };

22
interface/bmpbuttn.h
View File

@@ -86,13 +86,13 @@ public:
@sa Create(), wxValidator @sa Create(), wxValidator
*/ */
wxBitmapButton(); wxBitmapButton();
wxBitmapButton(wxWindow* parent, wxWindowID id, wxBitmapButton(wxWindow* parent, wxWindowID id,
const wxBitmap& bitmap, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW, long style = wxBU_AUTODRAW,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "button"); const wxString& name = "button");
//@} //@}
/** /**
@@ -121,7 +121,7 @@ public:
@sa SetBitmapDisabled() @sa SetBitmapDisabled()
*/ */
const wxBitmap GetBitmapDisabled(); const wxBitmap GetBitmapDisabled();
wxBitmap GetBitmapDisabled(); wxBitmap GetBitmapDisabled();
//@} //@}
//@{ //@{
@@ -133,7 +133,7 @@ public:
@sa SetBitmapFocus() @sa SetBitmapFocus()
*/ */
const wxBitmap GetBitmapFocus(); const wxBitmap GetBitmapFocus();
wxBitmap GetBitmapFocus(); wxBitmap GetBitmapFocus();
//@} //@}
//@{ //@{
@@ -143,7 +143,7 @@ public:
@sa SetBitmapHover() @sa SetBitmapHover()
*/ */
const wxBitmap GetBitmapHover(); const wxBitmap GetBitmapHover();
wxBitmap GetBitmapHover(); wxBitmap GetBitmapHover();
//@} //@}
//@{ //@{
@@ -155,7 +155,7 @@ public:
@sa SetBitmapLabel() @sa SetBitmapLabel()
*/ */
const wxBitmap GetBitmapLabel(); const wxBitmap GetBitmapLabel();
wxBitmap GetBitmapLabel(); wxBitmap GetBitmapLabel();
//@} //@}
/** /**

70
interface/bmpcbox.h
View File

@@ -87,23 +87,23 @@ public:
@sa Create(), wxValidator @sa Create(), wxValidator
*/ */
wxBitmapComboBox(); wxBitmapComboBox();
wxBitmapComboBox(wxWindow* parent, wxWindowID id, wxBitmapComboBox(wxWindow* parent, wxWindowID id,
const wxString& value = "", const wxString& value = "",
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, int n = 0,
const wxString choices[] = @NULL, const wxString choices[] = @NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox"); const wxString& name = "comboBox");
wxBitmapComboBox(wxWindow* parent, wxWindowID id, wxBitmapComboBox(wxWindow* parent, wxWindowID id,
const wxString& value, const wxString& value,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox"); const wxString& name = "comboBox");
//@} //@}
/** /**
@@ -118,10 +118,10 @@ public:
*/ */
int Append(const wxString& item, int Append(const wxString& item,
const wxBitmap& bitmap = wxNullBitmap); const wxBitmap& bitmap = wxNullBitmap);
int Append(const wxString& item, const wxBitmap& bitmap, int Append(const wxString& item, const wxBitmap& bitmap,
void * clientData); void * clientData);
int Append(const wxString& item, const wxBitmap& bitmap, int Append(const wxString& item, const wxBitmap& bitmap,
wxClientData * clientData); wxClientData * clientData);
//@} //@}
//@{ //@{
@@ -138,14 +138,14 @@ public:
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox"); const wxString& name = "comboBox");
bool Create(wxWindow* parent, wxWindowID id, bool Create(wxWindow* parent, wxWindowID id,
const wxString& value, const wxString& value,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox"); const wxString& name = "comboBox");
//@} //@}
/** /**
@@ -166,12 +166,12 @@ public:
*/ */
int Insert(const wxString& item, const wxBitmap& bitmap, int Insert(const wxString& item, const wxBitmap& bitmap,
unsigned int pos); unsigned int pos);
int Insert(const wxString& item, const wxBitmap& bitmap, int Insert(const wxString& item, const wxBitmap& bitmap,
unsigned int pos, unsigned int pos,
void * clientData); void * clientData);
int Insert(const wxString& item, const wxBitmap& bitmap, int Insert(const wxString& item, const wxBitmap& bitmap,
unsigned int pos, unsigned int pos,
wxClientData * clientData); wxClientData * clientData);
//@} //@}
/** /**

14
interface/brush.h
View File

@@ -117,10 +117,10 @@ public:
@sa wxBrushList, wxColour, wxColourDatabase @sa wxBrushList, wxColour, wxColourDatabase
*/ */
wxBrush(); wxBrush();
wxBrush(const wxColour& colour, int style = wxSOLID); wxBrush(const wxColour& colour, int style = wxSOLID);
wxBrush(const wxString& colourName, int style); wxBrush(const wxString& colourName, int style);
wxBrush(const wxBitmap& stippleBitmap); wxBrush(const wxBitmap& stippleBitmap);
wxBrush(const wxBrush& brush); wxBrush(const wxBrush& brush);
//@} //@}
/** /**
@@ -233,9 +233,9 @@ public:
@sa GetColour() @sa GetColour()
*/ */
void SetColour(wxColour& colour); void SetColour(wxColour& colour);
void SetColour(const wxString& colourName); void SetColour(const wxString& colourName);
void SetColour(unsigned char red, unsigned char green, void SetColour(unsigned char red, unsigned char green,
unsigned char blue); unsigned char blue);
//@} //@}
/** /**

2
interface/buffer.h
View File

@@ -30,7 +30,7 @@ public:
size of new buffer. size of new buffer.
*/ */
wxMemoryBuffer(const wxMemoryBuffer& src); wxMemoryBuffer(const wxMemoryBuffer& src);
wxMemoryBuffer(size_t size); wxMemoryBuffer(size_t size);
//@} //@}
/** /**

14
interface/button.h
View File

@@ -85,13 +85,13 @@ public:
@sa Create(), wxValidator @sa Create(), wxValidator
*/ */
wxButton(); wxButton();
wxButton(wxWindow* parent, wxWindowID id, wxButton(wxWindow* parent, wxWindowID id,
const wxString& label = wxEmptyString, const wxString& label = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "button"); const wxString& name = "button");
//@} //@}
/** /**

26
interface/calctrl.h
View File

@@ -58,13 +58,13 @@ public:
The constructors. The constructors.
*/ */
wxCalendarDateAttr(); wxCalendarDateAttr();
wxCalendarDateAttr(const wxColour& colText, wxCalendarDateAttr(const wxColour& colText,
const wxColour& colBack = wxNullColour, const wxColour& colBack = wxNullColour,
const wxColour& colBorder = wxNullColour, const wxColour& colBorder = wxNullColour,
const wxFont& font = wxNullFont, const wxFont& font = wxNullFont,
wxCalendarDateBorder border = wxCAL_BORDER_NONE); wxCalendarDateBorder border = wxCAL_BORDER_NONE);
wxCalendarDateAttr(wxCalendarDateBorder border, wxCalendarDateAttr(wxCalendarDateBorder border,
const wxColour& colBorder = wxNullColour); const wxColour& colBorder = wxNullColour);
//@} //@}
/** /**
@@ -220,12 +220,12 @@ public:
Does the same as Create() method. Does the same as Create() method.
*/ */
wxCalendarCtrl(); wxCalendarCtrl();
wxCalendarCtrl(wxWindow* parent, wxWindowID id, wxCalendarCtrl(wxWindow* parent, wxWindowID id,
const wxDateTime& date = wxDefaultDateTime, const wxDateTime& date = wxDefaultDateTime,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCAL_SHOW_HOLIDAYS, long style = wxCAL_SHOW_HOLIDAYS,
const wxString& name = wxCalendarNameStr); const wxString& name = wxCalendarNameStr);
//@} //@}
/** /**

14
interface/caret.h
View File

@@ -36,8 +36,8 @@ public:
with the given window. with the given window.
*/ */
wxCaret(); wxCaret();
wxCaret(wxWindow* window, int width, int height); wxCaret(wxWindow* window, int width, int height);
wxCaret(wxWindowBase* window, const wxSize& size); wxCaret(wxWindowBase* window, const wxSize& size);
//@} //@}
//@{ //@{
@@ -46,7 +46,7 @@ public:
with the given window (same as constructor). with the given window (same as constructor).
*/ */
bool Create(wxWindowBase* window, int width, int height); bool Create(wxWindowBase* window, int width, int height);
bool Create(wxWindowBase* window, const wxSize& size); bool Create(wxWindowBase* window, const wxSize& size);
//@} //@}
/** /**
@@ -74,7 +74,7 @@ public:
@c ( x, y ) @c ( x, y )
*/ */
void GetPosition(int* x, int* y); void GetPosition(int* x, int* y);
wxPoint GetPosition(); wxPoint GetPosition();
//@} //@}
//@{ //@{
@@ -95,7 +95,7 @@ public:
@c ( width, height ) @c ( width, height )
*/ */
void GetSize(int* width, int* height); void GetSize(int* width, int* height);
wxSize GetSize(); wxSize GetSize();
//@} //@}
/** /**
@@ -125,7 +125,7 @@ public:
Move the caret to given position (in logical coordinates). Move the caret to given position (in logical coordinates).
*/ */
void Move(int x, int y); void Move(int x, int y);
void Move(const wxPoint& pt); void Move(const wxPoint& pt);
//@} //@}
/** /**
@@ -144,7 +144,7 @@ public:
Changes the size of the caret. Changes the size of the caret.
*/ */
void SetSize(int width, int height); void SetSize(int width, int height);
void SetSize(const wxSize& size); void SetSize(const wxSize& size);
//@} //@}
/** /**

20
interface/chartype.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: chartype.h // Name: chartype.h
// Purpose: documentation for global functions // Purpose: documentation for global functions
// Author: wxWidgets team // Author: wxWidgets team
// RCS-ID: $Id$ // RCS-ID: $Id$
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
//@{ //@{
/** /**
wxT() is a macro which can be used with character and string literals (in other wxT() is a macro which can be used with character and string literals (in other
words, @c 'x' or @c "foo") to automatically convert them to Unicode in words, @c 'x' or @c "foo") to automatically convert them to Unicode in
@@ -25,11 +25,11 @@
@endcode @endcode
*/ */
wxChar wxT(char ch); wxChar wxT(char ch);
const wxChar * wxT(const char * s); const wxChar * wxT(const char * s);
//@} //@}
//@{ //@{
/** /**
wxS is macro which can be used with character and string literals to either wxS is macro which can be used with character and string literals to either
convert them to wide characters or strings in @c wchar_t-based Unicode convert them to wide characters or strings in @c wchar_t-based Unicode
@@ -42,6 +42,6 @@ wxChar wxT(char ch);
@sa wxT @sa wxT
*/ */
wxStringCharType wxS(char ch); wxStringCharType wxS(char ch);
const wxStringCharType * wxS(const char * s); const wxStringCharType * wxS(const char * s);
//@} //@}

14
interface/checkbox.h
View File

@@ -78,13 +78,13 @@ public:
@sa Create(), wxValidator @sa Create(), wxValidator
*/ */
wxCheckBox(); wxCheckBox();
wxCheckBox(wxWindow* parent, wxWindowID id, wxCheckBox(wxWindow* parent, wxWindowID id,
const wxString& label, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& val, const wxValidator& val,
const wxString& name = "checkBox"); const wxString& name = "checkBox");
//@} //@}
/** /**

30
interface/checklst.h
View File

@@ -69,21 +69,21 @@ public:
Window name. Window name.
*/ */
wxCheckListBox(); wxCheckListBox();
wxCheckListBox(wxWindow* parent, wxWindowID id, wxCheckListBox(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n, int n,
const wxString choices[] = @NULL, const wxString choices[] = @NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "listBox"); const wxString& name = "listBox");
wxCheckListBox(wxWindow* parent, wxWindowID id, wxCheckListBox(wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "listBox"); const wxString& name = "listBox");
//@} //@}
/** /**

110
interface/choicdlg.h
View File

@@ -76,12 +76,12 @@ public:
const wxString* choices, const wxString* choices,
long style = wxCHOICEDLG_STYLE, long style = wxCHOICEDLG_STYLE,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);
wxMultiChoiceDialog(wxWindow* parent, wxMultiChoiceDialog(wxWindow* parent,
const wxString& message, const wxString& message,
const wxString& caption, const wxString& caption,
const wxArrayString& choices, const wxArrayString& choices,
long style = wxCHOICEDLG_STYLE, long style = wxCHOICEDLG_STYLE,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);
//@} //@}
/** /**
@@ -177,13 +177,13 @@ public:
void** clientData = @NULL, void** clientData = @NULL,
long style = wxCHOICEDLG_STYLE, long style = wxCHOICEDLG_STYLE,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);
wxSingleChoiceDialog(wxWindow* parent, wxSingleChoiceDialog(wxWindow* parent,
const wxString& message, const wxString& message,
const wxString& caption, const wxString& caption,
const wxArrayString& choices, const wxArrayString& choices,
void** clientData = @NULL, void** clientData = @NULL,
long style = wxCHOICEDLG_STYLE, long style = wxCHOICEDLG_STYLE,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);
//@} //@}
/** /**
@@ -231,16 +231,16 @@ int wxGetSingleChoiceIndex(const wxString& message,
bool centre = @true, bool centre = @true,
int width=150, int width=150,
int height=200); int height=200);
int wxGetSingleChoiceIndex(const wxString& message, int wxGetSingleChoiceIndex(const wxString& message,
const wxString& caption, const wxString& caption,
int n, int n,
const wxString& choices[], const wxString& choices[],
wxWindow * parent = @NULL, wxWindow * parent = @NULL,
int x = -1, int x = -1,
int y = -1, int y = -1,
bool centre = @true, bool centre = @true,
int width=150, int width=150,
int height=200); int height=200);
//@} //@}
//@{ //@{
@@ -267,16 +267,16 @@ wxString wxGetSingleChoice(const wxString& message,
bool centre = @true, bool centre = @true,
int width=150, int width=150,
int height=200); int height=200);
wxString wxGetSingleChoice(const wxString& message, wxString wxGetSingleChoice(const wxString& message,
const wxString& caption, const wxString& caption,
int n, int n,
const wxString& choices[], const wxString& choices[],
wxWindow * parent = @NULL, wxWindow * parent = @NULL,
int x = -1, int x = -1,
int y = -1, int y = -1,
bool centre = @true, bool centre = @true,
int width=150, int width=150,
int height=200); int height=200);
//@} //@}
//@{ //@{
@@ -296,17 +296,17 @@ wxString wxGetSingleChoiceData(const wxString& message,
bool centre = @true, bool centre = @true,
int width=150, int width=150,
int height=200); int height=200);
wxString wxGetSingleChoiceData(const wxString& message, wxString wxGetSingleChoiceData(const wxString& message,
const wxString& caption, const wxString& caption,
int n, int n,
const wxString& choices[], const wxString& choices[],
const wxString& client_data[], const wxString& client_data[],
wxWindow * parent = @NULL, wxWindow * parent = @NULL,
int x = -1, int x = -1,
int y = -1, int y = -1,
bool centre = @true, bool centre = @true,
int width=150, int width=150,
int height=200); int height=200);
//@} //@}
//@{ //@{
@@ -334,16 +334,16 @@ size_t wxGetMultipleChoices(wxArrayInt& selections,
bool centre = @true, bool centre = @true,
int width=150, int width=150,
int height=200); int height=200);
size_t wxGetMultipleChoices(wxArrayInt& selections, size_t wxGetMultipleChoices(wxArrayInt& selections,
const wxString& message, const wxString& message,
const wxString& caption, const wxString& caption,
int n, int n,
const wxString& choices[], const wxString& choices[],
wxWindow * parent = @NULL, wxWindow * parent = @NULL,
int x = -1, int x = -1,
int y = -1, int y = -1,
bool centre = @true, bool centre = @true,
int width=150, int width=150,
int height=200); int height=200);
//@} //@}

42
interface/choice.h
View File

@@ -70,20 +70,20 @@ public:
@sa Create(), wxValidator @sa Create(), wxValidator
*/ */
wxChoice(); wxChoice();
wxChoice(wxWindow * parent, wxWindowID id, wxChoice(wxWindow * parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, int n, const wxSize& size, int n,
const wxString choices[], const wxString choices[],
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "choice"); const wxString& name = "choice");
wxChoice(wxWindow * parent, wxWindowID id, wxChoice(wxWindow * parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "choice"); const wxString& name = "choice");
//@} //@}
/** /**
@@ -101,13 +101,13 @@ public:
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "choice"); const wxString& name = "choice");
bool Create(wxWindow * parent, wxWindowID id, bool Create(wxWindow * parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "choice"); const wxString& name = "choice");
//@} //@}
/** /**

10
interface/choicebk.h
View File

@@ -53,10 +53,10 @@ public:
Constructs a choicebook control. Constructs a choicebook control.
*/ */
wxChoicebook(); wxChoicebook();
wxChoicebook(wxWindow* parent, wxWindowID id, wxChoicebook(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxEmptyStr); const wxString& name = wxEmptyStr);
//@} //@}
}; };

36
interface/clipboard.h
View File

@@ -1,32 +1,32 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: clipboard.h // Name: clipboard.h
// Purpose: documentation for global functions // Purpose: documentation for global functions
// Author: wxWidgets team // Author: wxWidgets team
// RCS-ID: $Id$ // RCS-ID: $Id$
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** /**
Gets the name of a registered clipboard format, and puts it into the buffer @e Gets the name of a registered clipboard format, and puts it into the buffer @e
formatName which is of maximum formatName which is of maximum
length @e maxCount. @e dataFormat must not specify a predefined clipboard length @e maxCount. @e dataFormat must not specify a predefined clipboard
format. format.
*/ */
bool wxGetClipboardFormatName(int dataFormat, bool wxGetClipboardFormatName(int dataFormat,
const wxString& formatName, const wxString& formatName,
int maxCount); int maxCount);
/** /**
Gets data from the clipboard. Gets data from the clipboard.
@e dataFormat may be one of: @e dataFormat may be one of:
wxCF_TEXT or wxCF_OEMTEXT: returns a pointer to new memory containing a wxCF_TEXT or wxCF_OEMTEXT: returns a pointer to new memory containing a
null-terminated text string. null-terminated text string.
wxCF_BITMAP: returns a new wxBitmap. wxCF_BITMAP: returns a new wxBitmap.
The clipboard must have previously been opened for this call to succeed. The clipboard must have previously been opened for this call to succeed.
*/ */
wxObject * wxGetClipboardData(int dataFormat); wxObject * wxGetClipboardData(int dataFormat);

2
interface/clntdata.h
View File

@@ -127,7 +127,7 @@ public:
Create client data with string. Create client data with string.
*/ */
wxStringClientData(); wxStringClientData();
wxStringClientData(const wxString& data); wxStringClientData(const wxString& data);
//@} //@}
/** /**

2
interface/clrpicker.h
View File

@@ -99,7 +99,7 @@ public:
Sets the currently selected colour. See wxColour::Set. Sets the currently selected colour. See wxColour::Set.
*/ */
void SetColour(const wxColour & col); void SetColour(const wxColour & col);
void SetColour(const wxString & colname); void SetColour(const wxString & colname);
//@} //@}
}; };

26
interface/cmdline.h
View File

@@ -70,14 +70,14 @@ public:
@ref setdesc() "command line description". @ref setdesc() "command line description".
*/ */
wxCmdLineParser(); wxCmdLineParser();
wxCmdLineParser(int argc, char** argv); wxCmdLineParser(int argc, char** argv);
wxCmdLineParser(int argc, wchar_t** argv); wxCmdLineParser(int argc, wchar_t** argv);
wxCmdLineParser(const wxString& cmdline); wxCmdLineParser(const wxString& cmdline);
wxCmdLineParser(const wxCmdLineEntryDesc* desc); wxCmdLineParser(const wxCmdLineEntryDesc* desc);
wxCmdLineParser(const wxCmdLineEntryDesc* desc, int argc, wxCmdLineParser(const wxCmdLineEntryDesc* desc, int argc,
char** argv); char** argv);
wxCmdLineParser(const wxCmdLineEntryDesc* desc, wxCmdLineParser(const wxCmdLineEntryDesc* desc,
const wxString& cmdline); const wxString& cmdline);
//@} //@}
/** /**
@@ -206,9 +206,9 @@ public:
value in the provided pointer (which should not be @NULL). value in the provided pointer (which should not be @NULL).
*/ */
bool Found(const wxString& name); bool Found(const wxString& name);
bool Found(const wxString& name, wxString* value); bool Found(const wxString& name, wxString* value);
bool Found(const wxString& name, long* value); bool Found(const wxString& name, long* value);
bool Found(const wxString& name, wxDateTime* value); bool Found(const wxString& name, wxDateTime* value);
//@} //@}
/** /**
@@ -268,8 +268,8 @@ public:
Set command line to parse after using one of the constructors which don't do it. Set command line to parse after using one of the constructors which don't do it.
*/ */
void SetCmdLine(int argc, char** argv); void SetCmdLine(int argc, char** argv);
void SetCmdLine(int argc, wchar_t** argv); void SetCmdLine(int argc, wchar_t** argv);
void SetCmdLine(const wxString& cmdline); void SetCmdLine(const wxString& cmdline);
//@} //@}
/** /**

16
interface/cmndata.h
View File

@@ -153,8 +153,8 @@ public:
Construct an object from a print data object. Construct an object from a print data object.
*/ */
wxPageSetupDialogData(); wxPageSetupDialogData();
wxPageSetupDialogData(wxPageSetupDialogData& data); wxPageSetupDialogData(wxPageSetupDialogData& data);
wxPageSetupDialogData(wxPrintData& printData); wxPageSetupDialogData(wxPrintData& printData);
//@} //@}
/** /**
@@ -338,7 +338,7 @@ public:
Assigns page setup data to this object. Assigns page setup data to this object.
*/ */
void operator =(const wxPrintData& data); void operator =(const wxPrintData& data);
void operator =(const wxPageSetupDialogData& data); void operator =(const wxPageSetupDialogData& data);
//@} //@}
}; };
@@ -453,7 +453,7 @@ public:
Copy constructor. Copy constructor.
*/ */
wxPrintData(); wxPrintData();
wxPrintData(const wxPrintData& data); wxPrintData(const wxPrintData& data);
//@} //@}
/** /**
@@ -587,7 +587,7 @@ public:
but retained for backward compatibility. but retained for backward compatibility.
*/ */
void operator =(const wxPrintData& data); void operator =(const wxPrintData& data);
void operator =(const wxPrintSetupData& data); void operator =(const wxPrintSetupData& data);
//@} //@}
}; };
@@ -615,8 +615,8 @@ public:
Construct an object from a print dialog data object. Construct an object from a print dialog data object.
*/ */
wxPrintDialogData(); wxPrintDialogData();
wxPrintDialogData(wxPrintDialogData& dialogData); wxPrintDialogData(wxPrintDialogData& dialogData);
wxPrintDialogData(wxPrintData& printData); wxPrintDialogData(wxPrintData& printData);
//@} //@}
/** /**
@@ -763,6 +763,6 @@ public:
Assigns another print dialog data object to this object. Assigns another print dialog data object to this object.
*/ */
void operator =(const wxPrintData& data); void operator =(const wxPrintData& data);
void operator =(const wxPrintDialogData& data); void operator =(const wxPrintDialogData& data);
//@} //@}
}; };

32
interface/colour.h
View File

@@ -73,11 +73,11 @@ public:
@sa wxColourDatabase @sa wxColourDatabase
*/ */
wxColour(); wxColour();
wxColour(unsigned char red, unsigned char green, wxColour(unsigned char red, unsigned char green,
unsigned char blue, unsigned char blue,
unsigned char alpha=wxALPHA_OPAQUE); unsigned char alpha=wxALPHA_OPAQUE);
wxColour(const wxString& colourNname); wxColour(const wxString& colourNname);
wxColour(const wxColour& colour); wxColour(const wxColour& colour);
//@} //@}
/** /**
@@ -99,14 +99,14 @@ public:
This function is new since wxWidgets version 2.7.0 This function is new since wxWidgets version 2.7.0
*/ */
wxString GetAsString(long flags); wxString GetAsString(long flags);
wxC2S_NAME wxC2S_CSS_SYNTAX, to obtain wxC2S_NAME wxC2S_CSS_SYNTAX, to obtain
the colour in the "rgb(r,g,b)" or "rgba(r,g,b,a)" syntax the colour in the "rgb(r,g,b)" or "rgba(r,g,b,a)" syntax
(e.g. wxColour(255,0,0,85) - "rgba(255,0,0,0.333)"), and (e.g. wxColour(255,0,0,85) - "rgba(255,0,0,0.333)"), and
wxC2S_HTML_SYNTAX, to obtain the colour as "#" followed wxC2S_HTML_SYNTAX, to obtain the colour as "#" followed
by 6 hexadecimal digits (e.g. wxColour(255,0,0) - "#FF0000"). by 6 hexadecimal digits (e.g. wxColour(255,0,0) - "#FF0000").
This function never fails and always returns a non-empty string but asserts if This function never fails and always returns a non-empty string but asserts if
the colour has alpha channel (i.e. is non opaque) but the colour has alpha channel (i.e. is non opaque) but
wxC2S_CSS_SYNTAX(); wxC2S_CSS_SYNTAX();
//@} //@}
/** /**
@@ -152,8 +152,8 @@ wxC2S_CSS_SYNTAX();
void Set(unsigned char red, unsigned char green, void Set(unsigned char red, unsigned char green,
unsigned char blue, unsigned char blue,
unsigned char alpha=wxALPHA_OPAQUE); unsigned char alpha=wxALPHA_OPAQUE);
void Set(unsigned long RGB); void Set(unsigned long RGB);
bool Set(const wxString & str); bool Set(const wxString & str);
//@} //@}
/** /**
@@ -169,7 +169,7 @@ wxC2S_CSS_SYNTAX();
@sa wxColourDatabase @sa wxColourDatabase
*/ */
wxColour operator =(const wxColour& colour); wxColour operator =(const wxColour& colour);
wxColour operator =(const wxString& colourName); wxColour operator =(const wxString& colourName);
//@} //@}
/** /**

14
interface/combo.h
View File

@@ -228,13 +228,13 @@ public:
@sa Create(), wxValidator @sa Create(), wxValidator
*/ */
wxComboCtrl(); wxComboCtrl();
wxComboCtrl(wxWindow* parent, wxWindowID id, wxComboCtrl(wxWindow* parent, wxWindowID id,
const wxString& value = "", const wxString& value = "",
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboCtrl"); const wxString& name = "comboCtrl");
//@} //@}
/** /**

50
interface/combobox.h
View File

@@ -102,23 +102,23 @@ public:
@sa Create(), wxValidator @sa Create(), wxValidator
*/ */
wxComboBox(); wxComboBox();
wxComboBox(wxWindow* parent, wxWindowID id, wxComboBox(wxWindow* parent, wxWindowID id,
const wxString& value = "", const wxString& value = "",
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, int n = 0,
const wxString choices[] = @NULL, const wxString choices[] = @NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox"); const wxString& name = "comboBox");
wxComboBox(wxWindow* parent, wxWindowID id, wxComboBox(wxWindow* parent, wxWindowID id,
const wxString& value, const wxString& value,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox"); const wxString& name = "comboBox");
//@} //@}
/** /**
@@ -178,14 +178,14 @@ public:
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox"); const wxString& name = "comboBox");
bool Create(wxWindow* parent, wxWindowID id, bool Create(wxWindow* parent, wxWindowID id,
const wxString& value, const wxString& value,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox"); const wxString& name = "comboBox");
//@} //@}
/** /**

40
interface/config.h
View File

@@ -419,21 +419,21 @@ public:
Returns a boolean Returns a boolean
*/ */
bool Read(const wxString& key, wxString* str); bool Read(const wxString& key, wxString* str);
bool Read(const wxString& key, wxString* str, bool Read(const wxString& key, wxString* str,
const wxString& defaultVal); const wxString& defaultVal);
wxString Read(const wxString& key, wxString Read(const wxString& key,
const const
wxString& defaultVal); wxString& defaultVal);
bool Read(const wxString& key, long* l); bool Read(const wxString& key, long* l);
bool Read(const wxString& key, long* l, long defaultVal); bool Read(const wxString& key, long* l, long defaultVal);
bool Read(const wxString& key, double* d); bool Read(const wxString& key, double* d);
bool Read(const wxString& key, double* d, double defaultVal); bool Read(const wxString& key, double* d, double defaultVal);
bool Read(const wxString& key, bool* b); bool Read(const wxString& key, bool* b);
bool Read(const wxString& key, bool* d, bool defaultVal); bool Read(const wxString& key, bool* d, bool defaultVal);
bool Read(const wxString& key, wxMemoryBuffer* buf); bool Read(const wxString& key, wxMemoryBuffer* buf);
bool Read(const wxString& key, T* value); bool Read(const wxString& key, T* value);
bool Read(const wxString& key, T* value, bool Read(const wxString& key, T* value,
T const& defaultVal); T const& defaultVal);
//@} //@}
/** /**
@@ -597,10 +597,10 @@ wxString& defaultVal);
Writes a boolean Writes a boolean
*/ */
bool Write(const wxString& key, const wxString& value); bool Write(const wxString& key, const wxString& value);
bool Write(const wxString& key, long value); bool Write(const wxString& key, long value);
bool Write(const wxString& key, double value); bool Write(const wxString& key, double value);
bool Write(const wxString& key, bool value); bool Write(const wxString& key, bool value);
bool Write(const wxString& key, const wxMemoryBuffer& buf); bool Write(const wxString& key, const wxMemoryBuffer& buf);
bool Write(const wxString& key, const T& buf); bool Write(const wxString& key, const T& buf);
//@} //@}
}; };

2
interface/control.h
View File

@@ -46,7 +46,7 @@ public:
version, without the mnemonics characters. version, without the mnemonics characters.
*/ */
const wxString GetLabelText(); const wxString GetLabelText();
static wxString GetLabelText(const wxString& label); static wxString GetLabelText(const wxString& label);
//@} //@}
/** /**

36
interface/cpp.h
View File

@@ -1,33 +1,33 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: cpp.h // Name: cpp.h
// Purpose: documentation for global functions // Purpose: documentation for global functions
// Author: wxWidgets team // Author: wxWidgets team
// RCS-ID: $Id$ // RCS-ID: $Id$
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
//@{ //@{
/** /**
These macro return the concatenation of the tokens passed as their arguments. These macro return the concatenation of the tokens passed as their arguments.
Unlike when using the preprocessor @c operator, the arguments undergo Unlike when using the preprocessor @c operator, the arguments undergo
the macro expansion before being concatenated. the macro expansion before being concatenated.
*/ */
wxCONCAT(x1, x2); wxCONCAT(x1, x2);
wxCONCAT3(x1, x2, x3); wxCONCAT3(x1, x2, x3);
wxCONCAT4(x1, x2, x3, x4); wxCONCAT4(x1, x2, x3, x4);
wxCONCAT5(x1, x2, x3, x4, x5); wxCONCAT5(x1, x2, x3, x4, x5);
//@} //@}
/** /**
Returns the string representation of the given symbol which can be either a Returns the string representation of the given symbol which can be either a
literal or a macro (hence the advantage of using this macro instead of the literal or a macro (hence the advantage of using this macro instead of the
standard preprocessor @c # operator which doesn't work with macros). standard preprocessor @c # operator which doesn't work with macros).
Notice that this macro always produces a @c char string, use Notice that this macro always produces a @c char string, use
wxSTRINGIZE_T to build a wide string Unicode build. wxSTRINGIZE_T to build a wide string Unicode build.
@sa wxCONCAT @sa wxCONCAT
*/ */
#define wxSTRINGIZE(x) /* implementation is private */ #define wxSTRINGIZE(x) /* implementation is private */

12
interface/cshelp.h
View File

@@ -52,7 +52,7 @@ public:
the application, for example. the application, for example.
*/ */
wxString GetHelp(const wxWindowBase* window); wxString GetHelp(const wxWindowBase* window);
void AddHelp(wxWindowID id, const wxString& text); void AddHelp(wxWindowID id, const wxString& text);
//@} //@}
/** /**
@@ -265,11 +265,11 @@ public:
Window style. Window style.
*/ */
wxContextHelpButton(); wxContextHelpButton();
wxContextHelpButton(wxWindow* parent, wxContextHelpButton(wxWindow* parent,
wxWindowID id = wxID_CONTEXT_HELP, wxWindowID id = wxID_CONTEXT_HELP,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW); long style = wxBU_AUTODRAW);
//@} //@}
}; };

60
interface/ctrlsub.h
View File

@@ -68,14 +68,14 @@ public:
or wxCB_SORT style). or wxCB_SORT style).
*/ */
int Append(const wxString& item); int Append(const wxString& item);
int Append(const wxString& item, void * clientData); int Append(const wxString& item, void * clientData);
int Append(const wxString& item, wxClientData * clientData); int Append(const wxString& item, wxClientData * clientData);
void Append(const wxArrayString& strings); void Append(const wxArrayString& strings);
void Append(unsigned int n, const wxString* strings); void Append(unsigned int n, const wxString* strings);
void Append(unsigned int n, const wxString* strings, void Append(unsigned int n, const wxString* strings,
void ** clientData); void ** clientData);
void Append(unsigned int n, const wxString* strings, void Append(unsigned int n, const wxString* strings,
wxClientData ** clientData); wxClientData ** clientData);
//@} //@}
/** /**
@@ -216,20 +216,20 @@ public:
insertion failed for some reason, -1 is returned. insertion failed for some reason, -1 is returned.
*/ */
int Insert(const wxString& item, unsigned int pos); int Insert(const wxString& item, unsigned int pos);
int Insert(const wxString& item, unsigned int pos, int Insert(const wxString& item, unsigned int pos,
void * clientData); void * clientData);
int Insert(const wxString& item, unsigned int pos, int Insert(const wxString& item, unsigned int pos,
wxClientData * clientData); wxClientData * clientData);
void Insert(const wxArrayString& strings, unsigned int pos); void Insert(const wxArrayString& strings, unsigned int pos);
void Insert(const wxArrayString& strings, unsigned int pos); void Insert(const wxArrayString& strings, unsigned int pos);
void Insert(unsigned int n, const wxString* strings, void Insert(unsigned int n, const wxString* strings,
unsigned int pos); unsigned int pos);
void Insert(unsigned int n, const wxString* strings, void Insert(unsigned int n, const wxString* strings,
unsigned int pos, unsigned int pos,
void ** clientData); void ** clientData);
void Insert(unsigned int n, const wxString* strings, void Insert(unsigned int n, const wxString* strings,
unsigned int pos, unsigned int pos,
wxClientData ** clientData); wxClientData ** clientData);
//@} //@}
/** /**
@@ -276,14 +276,14 @@ public:
wxCB_SORT style). wxCB_SORT style).
*/ */
int Set(const wxString& item); int Set(const wxString& item);
int Set(const wxString& item, void * clientData); int Set(const wxString& item, void * clientData);
int Set(const wxString& item, wxClientData * clientData); int Set(const wxString& item, wxClientData * clientData);
void Set(const wxArrayString& stringsArray); void Set(const wxArrayString& stringsArray);
void Set(unsigned int n, const wxString* strings); void Set(unsigned int n, const wxString* strings);
void Set(unsigned int n, const wxString* strings, void Set(unsigned int n, const wxString* strings,
void ** clientData); void ** clientData);
void Set(unsigned int n, const wxString* strings, void Set(unsigned int n, const wxString* strings,
wxClientData ** clientData); wxClientData ** clientData);
//@} //@}
/** /**

20
interface/cursor.h
View File

@@ -246,16 +246,16 @@ public:
Pointer or reference to a cursor to copy. Pointer or reference to a cursor to copy.
*/ */
wxCursor(); wxCursor();
wxCursor(const char bits[], int width, int height, wxCursor(const char bits[], int width, int height,
int hotSpotX=-1, int hotSpotY=-1, int hotSpotX=-1, int hotSpotY=-1,
const char maskBits[]=@NULL, const char maskBits[]=@NULL,
wxColour* fg=@NULL, wxColour* fg=@NULL,
wxColour* bg=@NULL); wxColour* bg=@NULL);
wxCursor(const wxString& cursorName, long type, wxCursor(const wxString& cursorName, long type,
int hotSpotX=0, int hotSpotY=0); int hotSpotX=0, int hotSpotY=0);
wxCursor(int cursorId); wxCursor(int cursorId);
wxCursor(const wxImage& image); wxCursor(const wxImage& image);
wxCursor(const wxCursor& cursor); wxCursor(const wxCursor& cursor);
//@} //@}
/** /**

112
interface/dataview.h
View File

@@ -27,7 +27,7 @@ public:
*/ */
wxDataViewIconText(const wxString& text = wxEmptyString, wxDataViewIconText(const wxString& text = wxEmptyString,
const wxIcon& icon = wxNullIcon); const wxIcon& icon = wxNullIcon);
wxDataViewIconText(const wxDataViewIconText& other); wxDataViewIconText(const wxDataViewIconText& other);
//@} //@}
/** /**
@@ -70,7 +70,7 @@ public:
*/ */
wxDataViewEvent(wxEventType commandType = wxEVT_@NULL, wxDataViewEvent(wxEventType commandType = wxEVT_@NULL,
int winid = 0); int winid = 0);
wxDataViewEvent(const wxDataViewEvent& event); wxDataViewEvent(const wxDataViewEvent& event);
//@} //@}
/** /**
@@ -754,7 +754,7 @@ public:
*/ */
wxDataViewItem(void* id = @NULL); wxDataViewItem(void* id = @NULL);
wxDataViewItem(const wxDataViewItem& item); wxDataViewItem(const wxDataViewItem& item);
//@} //@}
/** /**
@@ -829,11 +829,11 @@ public:
Constructor. Calls Create(). Constructor. Calls Create().
*/ */
wxDataViewCtrl(); wxDataViewCtrl();
wxDataViewCtrl(wxWindow* parent, wxWindowID id, wxDataViewCtrl(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator); const wxValidator& validator = wxDefaultValidator);
//@} //@}
/** /**
@@ -852,12 +852,12 @@ public:
int width = -1, int width = -1,
wxAlignment align = wxALIGN_CENTER, wxAlignment align = wxALIGN_CENTER,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
wxDataViewColumn* AppendBitmapColumn(const wxBitmap& label, wxDataViewColumn* AppendBitmapColumn(const wxBitmap& label,
unsigned int model_column, unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int width = -1, int width = -1,
wxAlignment align = wxALIGN_CENTER, wxAlignment align = wxALIGN_CENTER,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
//@} //@}
/** /**
@@ -881,12 +881,12 @@ public:
int width = -1, int width = -1,
wxAlignment align = wxALIGN_CENTER, wxAlignment align = wxALIGN_CENTER,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
wxDataViewColumn* AppendDateColumn(const wxBitmap& label, wxDataViewColumn* AppendDateColumn(const wxBitmap& label,
unsigned int model_column, unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
int width = -1, int width = -1,
wxAlignment align = wxALIGN_CENTER, wxAlignment align = wxALIGN_CENTER,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
//@} //@}
//@{ //@{
@@ -901,12 +901,12 @@ public:
int width = -1, int width = -1,
wxAlignment align = wxALIGN_LEFT, wxAlignment align = wxALIGN_LEFT,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
wxDataViewColumn* AppendIconTextColumn(const wxBitmap& label, wxDataViewColumn* AppendIconTextColumn(const wxBitmap& label,
unsigned int model_column, unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int width = -1, int width = -1,
wxAlignment align = wxALIGN_LEFT, wxAlignment align = wxALIGN_LEFT,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
//@} //@}
//@{ //@{
@@ -921,12 +921,12 @@ public:
int width = 80, int width = 80,
wxAlignment align = wxALIGN_CENTER, wxAlignment align = wxALIGN_CENTER,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
wxDataViewColumn* AppendProgressColumn(const wxBitmap& label, wxDataViewColumn* AppendProgressColumn(const wxBitmap& label,
unsigned int model_column, unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int width = 80, int width = 80,
wxAlignment align = wxALIGN_CENTER, wxAlignment align = wxALIGN_CENTER,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
//@} //@}
//@{ //@{
@@ -940,12 +940,12 @@ public:
int width = -1, int width = -1,
wxAlignment align = wxALIGN_LEFT, wxAlignment align = wxALIGN_LEFT,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
wxDataViewColumn* AppendTextColumn(const wxBitmap& label, wxDataViewColumn* AppendTextColumn(const wxBitmap& label,
unsigned int model_column, unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int width = -1, int width = -1,
wxAlignment align = wxALIGN_LEFT, wxAlignment align = wxALIGN_LEFT,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
//@} //@}
//@{ //@{
@@ -959,12 +959,12 @@ public:
int width = 30, int width = 30,
wxAlignment align = wxALIGN_CENTER, wxAlignment align = wxALIGN_CENTER,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
wxDataViewColumn* AppendToggleColumn(const wxBitmap& label, wxDataViewColumn* AppendToggleColumn(const wxBitmap& label,
unsigned int model_column, unsigned int model_column,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int width = 30, int width = 30,
wxAlignment align = wxALIGN_CENTER, wxAlignment align = wxALIGN_CENTER,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
//@} //@}
/** /**
@@ -1432,11 +1432,11 @@ public:
Constructor. Calls Create(). Constructor. Calls Create().
*/ */
wxDataViewTreeCtrl(); wxDataViewTreeCtrl();
wxDataViewTreeCtrl(wxWindow* parent, wxWindowID id, wxDataViewTreeCtrl(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDV_NO_HEADER, long style = wxDV_NO_HEADER,
const wxValidator& validator = wxDefaultValidator); const wxValidator& validator = wxDefaultValidator);
//@} //@}
/** /**
@@ -1527,7 +1527,7 @@ public:
Returns the store. Returns the store.
*/ */
wxDataViewTreeStore* GetStore(); wxDataViewTreeStore* GetStore();
const wxDataViewTreeStore* GetStore(); const wxDataViewTreeStore* GetStore();
//@} //@}
/** /**
@@ -1816,12 +1816,12 @@ public:
int width = wxDVC_DEFAULT_WIDTH, int width = wxDVC_DEFAULT_WIDTH,
wxAlignment align = wxALIGN_CENTRE, wxAlignment align = wxALIGN_CENTRE,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
wxDataViewColumn(const wxBitmap& bitmap, wxDataViewColumn(const wxBitmap& bitmap,
wxDataViewRenderer* renderer, wxDataViewRenderer* renderer,
unsigned int model_column, unsigned int model_column,
int width = wxDVC_DEFAULT_WIDTH, int width = wxDVC_DEFAULT_WIDTH,
wxAlignment align = wxALIGN_CENTRE, wxAlignment align = wxALIGN_CENTRE,
int flags = wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE);
//@} //@}
/** /**

82
interface/datetime.h
View File

@@ -79,8 +79,8 @@ public:
Adds the given date span to this object. Adds the given date span to this object.
*/ */
wxDateTime Add(const wxDateSpan& diff); wxDateTime Add(const wxDateSpan& diff);
wxDateTime Add(const wxDateSpan& diff); wxDateTime Add(const wxDateSpan& diff);
wxDateTime operator+=(const wxDateSpan& diff); wxDateTime operator+=(const wxDateSpan& diff);
//@} //@}
/** /**
@@ -484,9 +484,9 @@ public:
*/ */
static wxDateTime_t GetNumberOfDays(int year, static wxDateTime_t GetNumberOfDays(int year,
Calendar cal = Gregorian); Calendar cal = Gregorian);
static wxDateTime_t GetNumberOfDays(Month month, static wxDateTime_t GetNumberOfDays(Month month,
int year = Inv_Year, int year = Inv_Year,
Calendar cal = Gregorian); Calendar cal = Gregorian);
//@} //@}
/** /**
@@ -733,8 +733,8 @@ public:
*/ */
const char * ParseDate(const wxString& date, const char * ParseDate(const wxString& date,
wxString::const_iterator * end = @NULL); wxString::const_iterator * end = @NULL);
const char * ParseDate(const char * date); const char * ParseDate(const char * date);
const wchar_t * ParseDate(const wchar_t * date); const wchar_t * ParseDate(const wchar_t * date);
//@} //@}
//@{ //@{
@@ -750,8 +750,8 @@ public:
*/ */
const char * ParseDateTime(const wxString& datetime, const char * ParseDateTime(const wxString& datetime,
wxString::const_iterator * end = @NULL); wxString::const_iterator * end = @NULL);
const char * ParseDateTime(const char * datetime); const char * ParseDateTime(const char * datetime);
const wchar_t * ParseDateTime(const wchar_t * datetime); const wchar_t * ParseDateTime(const wchar_t * datetime);
//@} //@}
//@{ //@{
@@ -780,12 +780,12 @@ public:
const wxString& format = wxDefaultDateTimeFormat, const wxString& format = wxDefaultDateTimeFormat,
const wxDateTime& dateDef = wxDefaultDateTime, const wxDateTime& dateDef = wxDefaultDateTime,
wxString::const_iterator * end = @NULL); wxString::const_iterator * end = @NULL);
const char * ParseFormat(const char * date, const char * ParseFormat(const char * date,
const wxString& format = wxDefaultDateTimeFormat, const wxString& format = wxDefaultDateTimeFormat,
const wxDateTime& dateDef = wxDefaultDateTime); const wxDateTime& dateDef = wxDefaultDateTime);
const wchar_t * ParseFormat(const wchar_t * date, const wchar_t * ParseFormat(const wchar_t * date,
const wxString& format = wxDefaultDateTimeFormat, const wxString& format = wxDefaultDateTimeFormat,
const wxDateTime& dateDef = wxDefaultDateTime); const wxDateTime& dateDef = wxDefaultDateTime);
//@} //@}
/** /**
@@ -834,8 +834,8 @@ public:
*/ */
const char * ParseRfc822Date(const wxString& date, const char * ParseRfc822Date(const wxString& date,
wxString::const_iterator * end = @NULL); wxString::const_iterator * end = @NULL);
const char * ParseRfc822Date(const char* date); const char * ParseRfc822Date(const char* date);
const wchar_t * ParseRfc822Date(const wchar_t* date); const wchar_t * ParseRfc822Date(const wchar_t* date);
//@} //@}
//@{ //@{
@@ -848,8 +848,8 @@ public:
*/ */
const char * ParseTime(const wxString& time, const char * ParseTime(const wxString& time,
wxString::const_iterator * end = @NULL); wxString::const_iterator * end = @NULL);
const char * ParseTime(const char * time); const char * ParseTime(const char * time);
const wchar_t * ParseTime(const wchar_t * time); const wchar_t * ParseTime(const wchar_t * time);
//@} //@}
/** /**
@@ -931,11 +931,11 @@ public:
Sets the date and time from the parameters. Sets the date and time from the parameters.
*/ */
#define wxDateTime Set(wxDateTime_t day, Month month = Inv_Month, #define wxDateTime Set(wxDateTime_t day, Month month = Inv_Month,
int year = Inv_Year, int year = Inv_Year,
wxDateTime_t hour = 0, wxDateTime_t hour = 0,
wxDateTime_t minute = 0, wxDateTime_t minute = 0,
wxDateTime_t second = 0, wxDateTime_t second = 0,
wxDateTime_t millisec = 0) /* implementation is private */ wxDateTime_t millisec = 0) /* implementation is private */
/** /**
Sets the country to use by default. This setting influences the DST Sets the country to use by default. This setting influences the DST
@@ -1041,7 +1041,7 @@ public:
*/ */
bool SetToWeekDay(WeekDay weekday, int n = 1, bool SetToWeekDay(WeekDay weekday, int n = 1,
Month month = Inv_Month, Month month = Inv_Month,
int year = Inv_Year); int year = Inv_Year);
/** /**
Adjusts the date so that it will still lie in the same week as before, but its Adjusts the date so that it will still lie in the same week as before, but its
@@ -1194,7 +1194,7 @@ public:
Same as @ref settm() Set. Same as @ref settm() Set.
*/ */
wxDateTime operator(const struct tm& tm); wxDateTime operator(const struct tm& tm);
}; };
/** /**
@@ -1273,8 +1273,8 @@ public:
second and third ones modify this object in place. second and third ones modify this object in place.
*/ */
wxDateSpan Add(const wxDateSpan& other); wxDateSpan Add(const wxDateSpan& other);
wxDateSpan Add(const wxDateSpan& other); wxDateSpan Add(const wxDateSpan& other);
wxDateSpan operator+=(const wxDateSpan& other); wxDateSpan operator+=(const wxDateSpan& other);
//@} //@}
/** /**
@@ -1347,8 +1347,8 @@ public:
object in place. object in place.
*/ */
wxDateSpan Multiply(int factor); wxDateSpan Multiply(int factor);
wxDateSpan Multiply(int factor); wxDateSpan Multiply(int factor);
wxDateSpan operator*=(int factor); wxDateSpan operator*=(int factor);
//@} //@}
//@{ //@{
@@ -1358,7 +1358,7 @@ public:
@sa Negate() @sa Negate()
*/ */
wxDateSpan Neg(); wxDateSpan Neg();
wxDateSpan operator-(); wxDateSpan operator-();
//@} //@}
/** /**
@@ -1398,8 +1398,8 @@ public:
object, the second and third ones modify this object in place. object, the second and third ones modify this object in place.
*/ */
wxDateSpan Subtract(const wxDateSpan& other); wxDateSpan Subtract(const wxDateSpan& other);
wxDateSpan Subtract(const wxDateSpan& other); wxDateSpan Subtract(const wxDateSpan& other);
wxDateSpan operator+=(const wxDateSpan& other); wxDateSpan operator+=(const wxDateSpan& other);
//@} //@}
/** /**
@@ -1466,7 +1466,7 @@ public:
minutes, seconds or milliseconds. minutes, seconds or milliseconds.
*/ */
wxTimeSpan(); wxTimeSpan();
wxTimeSpan(long hours, long min, long sec, long msec); wxTimeSpan(long hours, long min, long sec, long msec);
//@} //@}
/** /**
@@ -1495,8 +1495,8 @@ public:
Returns the sum of two timespans. Returns the sum of two timespans.
*/ */
wxTimeSpan Add(const wxTimeSpan& diff); wxTimeSpan Add(const wxTimeSpan& diff);
wxTimeSpan Add(const wxTimeSpan& diff); wxTimeSpan Add(const wxTimeSpan& diff);
wxTimeSpan operator+=(const wxTimeSpan& diff); wxTimeSpan operator+=(const wxTimeSpan& diff);
//@} //@}
/** /**
@@ -1677,8 +1677,8 @@ public:
Multiplies timespan by a scalar. Multiplies timespan by a scalar.
*/ */
wxTimeSpan Multiply(int n); wxTimeSpan Multiply(int n);
wxTimeSpan Multiply(int n); wxTimeSpan Multiply(int n);
wxTimeSpan operator*=(int n); wxTimeSpan operator*=(int n);
//@} //@}
//@{ //@{
@@ -1686,7 +1686,7 @@ public:
Negate the value of the timespan. Negate the value of the timespan.
*/ */
wxTimeSpan Neg(); wxTimeSpan Neg();
wxTimeSpan operator-(); wxTimeSpan operator-();
//@} //@}
/** /**
@@ -1751,8 +1751,8 @@ public:
Returns the difference of two timespans. Returns the difference of two timespans.
*/ */
wxTimeSpan Subtract(const wxTimeSpan& diff); wxTimeSpan Subtract(const wxTimeSpan& diff);
wxTimeSpan Subtract(const wxTimeSpan& diff); wxTimeSpan Subtract(const wxTimeSpan& diff);
wxTimeSpan operator-=(const wxTimeSpan& diff); wxTimeSpan operator-=(const wxTimeSpan& diff);
//@} //@}
/** /**

24
interface/datstrm.h
View File

@@ -48,7 +48,7 @@ public:
recommended to use default value (UTF-8). recommended to use default value (UTF-8).
*/ */
wxDataOutputStream(wxOutputStream& stream); wxDataOutputStream(wxOutputStream& stream);
wxDataOutputStream(wxOutputStream& stream); wxDataOutputStream(wxOutputStream& stream);
//@} //@}
/** /**
@@ -70,7 +70,7 @@ public:
16 bit unsigned integer to write is specified with the @e size variable. 16 bit unsigned integer to write is specified with the @e size variable.
*/ */
void Write16(wxUint16 i16); void Write16(wxUint16 i16);
void Write16(const wxUint16 * buffer, size_t size); void Write16(const wxUint16 * buffer, size_t size);
//@} //@}
//@{ //@{
@@ -79,7 +79,7 @@ public:
32 bit unsigned integer to write is specified with the @e size variable. 32 bit unsigned integer to write is specified with the @e size variable.
*/ */
void Write32(wxUint32 i32); void Write32(wxUint32 i32);
void Write32(const wxUint32 * buffer, size_t size); void Write32(const wxUint32 * buffer, size_t size);
//@} //@}
//@{ //@{
@@ -88,7 +88,7 @@ public:
64 bit unsigned integer to write is specified with the @e size variable. 64 bit unsigned integer to write is specified with the @e size variable.
*/ */
void Write64(wxUint64 i64); void Write64(wxUint64 i64);
void Write64(const wxUint64 * buffer, size_t size); void Write64(const wxUint64 * buffer, size_t size);
//@} //@}
//@{ //@{
@@ -97,7 +97,7 @@ public:
specified with the @e size variable. specified with the @e size variable.
*/ */
void Write8(wxUint8 i8); void Write8(wxUint8 i8);
void Write8(const wxUint8 * buffer, size_t size); void Write8(const wxUint8 * buffer, size_t size);
//@} //@}
//@{ //@{
@@ -106,7 +106,7 @@ public:
specified with the @e size variable. specified with the @e size variable.
*/ */
void WriteDouble(double f); void WriteDouble(double f);
void WriteDouble(const double * buffer, size_t size); void WriteDouble(const double * buffer, size_t size);
//@} //@}
/** /**
@@ -183,7 +183,7 @@ public:
conv before you destroy this wxDataInputStream instance! conv before you destroy this wxDataInputStream instance!
*/ */
wxDataInputStream(wxInputStream& stream); wxDataInputStream(wxInputStream& stream);
wxDataInputStream(wxInputStream& stream); wxDataInputStream(wxInputStream& stream);
//@} //@}
/** /**
@@ -205,7 +205,7 @@ public:
amount of 16 bit unsigned integer to read is specified by the @e size variable. amount of 16 bit unsigned integer to read is specified by the @e size variable.
*/ */
wxUint16 Read16(); wxUint16 Read16();
void Read16(wxUint16 * buffer, size_t size); void Read16(wxUint16 * buffer, size_t size);
//@} //@}
//@{ //@{
@@ -215,7 +215,7 @@ public:
32 bit unsigned integer to read is specified by the @e size variable. 32 bit unsigned integer to read is specified by the @e size variable.
*/ */
wxUint32 Read32(); wxUint32 Read32();
void Read32(wxUint32 * buffer, size_t size); void Read32(wxUint32 * buffer, size_t size);
//@} //@}
//@{ //@{
@@ -225,7 +225,7 @@ public:
64 bit unsigned integer to read is specified by the @e size variable. 64 bit unsigned integer to read is specified by the @e size variable.
*/ */
wxUint64 Read64(); wxUint64 Read64();
void Read64(wxUint64 * buffer, size_t size); void Read64(wxUint64 * buffer, size_t size);
//@} //@}
//@{ //@{
@@ -234,7 +234,7 @@ public:
bytes to read is specified by the @e size variable. bytes to read is specified by the @e size variable.
*/ */
wxUint8 Read8(); wxUint8 Read8();
void Read8(wxUint8 * buffer, size_t size); void Read8(wxUint8 * buffer, size_t size);
//@} //@}
//@{ //@{
@@ -244,7 +244,7 @@ public:
double to read is specified by the @e size variable. double to read is specified by the @e size variable.
*/ */
double ReadDouble(); double ReadDouble();
void ReadDouble(double * buffer, size_t size); void ReadDouble(double * buffer, size_t size);
//@} //@}
/** /**

64
interface/dc.h
View File

@@ -210,7 +210,7 @@ public:
*/ */
void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width, void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width,
wxCoord height); wxCoord height);
void DrawCheckMark(const wxRect & rect); void DrawCheckMark(const wxRect & rect);
//@} //@}
//@{ //@{
@@ -220,7 +220,7 @@ public:
@sa DrawEllipse() @sa DrawEllipse()
*/ */
void DrawCircle(wxCoord x, wxCoord y, wxCoord radius); void DrawCircle(wxCoord x, wxCoord y, wxCoord radius);
void DrawCircle(const wxPoint& pt, wxCoord radius); void DrawCircle(const wxPoint& pt, wxCoord radius);
//@} //@}
//@{ //@{
@@ -233,8 +233,8 @@ public:
*/ */
void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, void DrawEllipse(wxCoord x, wxCoord y, wxCoord width,
wxCoord height); wxCoord height);
void DrawEllipse(const wxPoint& pt, const wxSize& size); void DrawEllipse(const wxPoint& pt, const wxSize& size);
void DrawEllipse(const wxRect& rect); void DrawEllipse(const wxRect& rect);
//@} //@}
/** /**
@@ -281,9 +281,9 @@ public:
int alignment = wxALIGN_LEFT | wxALIGN_TOP, int alignment = wxALIGN_LEFT | wxALIGN_TOP,
int indexAccel = -1, int indexAccel = -1,
wxRect * rectBounding = @NULL); wxRect * rectBounding = @NULL);
void DrawLabel(const wxString& text, const wxRect& rect, void DrawLabel(const wxString& text, const wxRect& rect,
int alignment = wxALIGN_LEFT | wxALIGN_TOP, int alignment = wxALIGN_LEFT | wxALIGN_TOP,
int indexAccel = -1); int indexAccel = -1);
//@} //@}
/** /**
@@ -302,9 +302,9 @@ public:
*/ */
void DrawLines(int n, wxPoint points[], wxCoord xoffset = 0, void DrawLines(int n, wxPoint points[], wxCoord xoffset = 0,
wxCoord yoffset = 0); wxCoord yoffset = 0);
void DrawLines(const wxPointList * points, void DrawLines(const wxPointList * points,
wxCoord xoffset = 0, wxCoord xoffset = 0,
wxCoord yoffset = 0); wxCoord yoffset = 0);
//@} //@}
/** /**
@@ -358,10 +358,10 @@ public:
void DrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, void DrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0,
wxCoord yoffset = 0, wxCoord yoffset = 0,
int fill_style = wxODDEVEN_RULE); int fill_style = wxODDEVEN_RULE);
void DrawPolygon(const wxPointList * points, void DrawPolygon(const wxPointList * points,
wxCoord xoffset = 0, wxCoord xoffset = 0,
wxCoord yoffset = 0, wxCoord yoffset = 0,
int fill_style = wxODDEVEN_RULE); int fill_style = wxODDEVEN_RULE);
//@} //@}
/** /**
@@ -408,11 +408,11 @@ public:
Draws a three-point spline using the current pen. Draws a three-point spline using the current pen.
*/ */
void DrawSpline(int n, wxPoint points[]); void DrawSpline(int n, wxPoint points[]);
void DrawSpline(const wxPointList * points); void DrawSpline(const wxPointList * points);
void DrawSpline(wxCoord x1, wxCoord y1, wxCoord x2, void DrawSpline(wxCoord x1, wxCoord y1, wxCoord x2,
wxCoord y2, wxCoord y2,
wxCoord x3, wxCoord x3,
wxCoord y3); wxCoord y3);
//@} //@}
/** /**
@@ -547,7 +547,7 @@ public:
wxCoord * h, wxCoord * h,
wxCoord * heightLine = @NULL, wxCoord * heightLine = @NULL,
wxFont * font = @NULL); wxFont * font = @NULL);
wxSize GetMultiLineTextExtent(const wxString& string); wxSize GetMultiLineTextExtent(const wxString& string);
//@} //@}
/** /**
@@ -605,7 +605,7 @@ public:
@c ( width, height ) @c ( width, height )
*/ */
void GetSize(wxCoord * width, wxCoord * height); void GetSize(wxCoord * width, wxCoord * height);
wxSize GetSize(); wxSize GetSize();
//@} //@}
//@{ //@{
@@ -613,7 +613,7 @@ public:
Returns the horizontal and vertical resolution in millimetres. Returns the horizontal and vertical resolution in millimetres.
*/ */
void GetSizeMM(wxCoord * width, wxCoord * height); void GetSizeMM(wxCoord * width, wxCoord * height);
wxSize GetSizeMM(); wxSize GetSizeMM();
//@} //@}
/** /**
@@ -645,7 +645,7 @@ public:
wxCoord * descent = @NULL, wxCoord * descent = @NULL,
wxCoord * externalLeading = @NULL, wxCoord * externalLeading = @NULL,
const wxFont * font = @NULL); const wxFont * font = @NULL);
wxSize GetTextExtent(const wxString& string); wxSize GetTextExtent(const wxString& string);
//@} //@}
/** /**
@@ -674,10 +674,10 @@ public:
void GradientFillConcentric(const wxRect& rect, void GradientFillConcentric(const wxRect& rect,
const wxColour& initialColour, const wxColour& initialColour,
const wxColour& destColour); const wxColour& destColour);
void GradientFillConcentric(const wxRect& rect, void GradientFillConcentric(const wxRect& rect,
const wxColour& initialColour, const wxColour& initialColour,
const wxColour& destColour, const wxColour& destColour,
const wxPoint& circleCenter); const wxPoint& circleCenter);
//@} //@}
/** /**
@@ -807,9 +807,9 @@ public:
*/ */
void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width,
wxCoord height); wxCoord height);
void SetClippingRegion(const wxPoint& pt, const wxSize& sz); void SetClippingRegion(const wxPoint& pt, const wxSize& sz);
void SetClippingRegion(const wxRect& rect); void SetClippingRegion(const wxRect& rect);
void SetClippingRegion(const wxRegion& region); void SetClippingRegion(const wxRegion& region);
//@} //@}
/** /**
@@ -1082,7 +1082,7 @@ public:
The clipping region is automatically unset when this object is destroyed. The clipping region is automatically unset when this object is destroyed.
*/ */
wxDCClipper(wxDC& dc, const wxRegion& r); wxDCClipper(wxDC& dc, const wxRegion& r);
wxDCClipper(wxDC& dc, const wxRect& rect); wxDCClipper(wxDC& dc, const wxRect& rect);
wxDCClipper(wxDC& dc, int x, int y, int w, int h); wxDCClipper(wxDC& dc, int x, int y, int w, int h);
//@} //@}
}; };

16
interface/dcbuffer.h
View File

@@ -76,10 +76,10 @@ public:
device context). device context).
*/ */
wxBufferedDC(); wxBufferedDC();
wxBufferedDC(wxDC * dc, const wxSize& area, wxBufferedDC(wxDC * dc, const wxSize& area,
int style = wxBUFFER_CLIENT_AREA); int style = wxBUFFER_CLIENT_AREA);
wxBufferedDC(wxDC * dc, wxBitmap& buffer, wxBufferedDC(wxDC * dc, wxBitmap& buffer,
int style = wxBUFFER_CLIENT_AREA); int style = wxBUFFER_CLIENT_AREA);
//@} //@}
/** /**
@@ -95,8 +95,8 @@ public:
*/ */
void Init(wxDC * dc, const wxSize& area, void Init(wxDC * dc, const wxSize& area,
int style = wxBUFFER_CLIENT_AREA); int style = wxBUFFER_CLIENT_AREA);
void Init(wxDC * dc, wxBitmap& buffer, void Init(wxDC * dc, wxBitmap& buffer,
int style = wxBUFFER_CLIENT_AREA); int style = wxBUFFER_CLIENT_AREA);
//@} //@}
}; };
@@ -176,8 +176,8 @@ public:
*/ */
wxBufferedPaintDC(wxWindow * window, wxBitmap& buffer, wxBufferedPaintDC(wxWindow * window, wxBitmap& buffer,
int style = wxBUFFER_CLIENT_AREA); int style = wxBUFFER_CLIENT_AREA);
wxBufferedPaintDC(wxWindow * window, wxBufferedPaintDC(wxWindow * window,
int style = wxBUFFER_CLIENT_AREA); int style = wxBUFFER_CLIENT_AREA);
//@} //@}
/** /**

2
interface/dcmemory.h
View File

@@ -33,7 +33,7 @@ public:
in creating a usable device context. in creating a usable device context.
*/ */
wxMemoryDC(); wxMemoryDC();
wxMemoryDC(wxBitmap& bitmap); wxMemoryDC(wxBitmap& bitmap);
//@} //@}
/** /**

8
interface/dcprint.h
View File

@@ -36,10 +36,10 @@ public:
This constructor is deprecated and retained only for backward compatibility. This constructor is deprecated and retained only for backward compatibility.
*/ */
wxPrinterDC(const wxPrintData& printData); wxPrinterDC(const wxPrintData& printData);
wxPrinterDC(const wxString& driver, const wxString& device, wxPrinterDC(const wxString& driver, const wxString& device,
const wxString& output, const wxString& output,
const bool interactive = @true, const bool interactive = @true,
int orientation = wxPORTRAIT); int orientation = wxPORTRAIT);
//@} //@}
/** /**

6
interface/dcps.h
View File

@@ -36,9 +36,9 @@ public:
use the wxPrintData constructor instead. use the wxPrintData constructor instead.
*/ */
wxPostScriptDC(const wxPrintData& printData); wxPostScriptDC(const wxPrintData& printData);
wxPostScriptDC(const wxString& output, wxPostScriptDC(const wxString& output,
bool interactive = @true, bool interactive = @true,
wxWindow * parent); wxWindow * parent);
//@} //@}
/** /**

2
interface/dcscreen.h
View File

@@ -67,6 +67,6 @@ public:
applications. applications.
*/ */
bool StartDrawingOnTop(wxWindow* window); bool StartDrawingOnTop(wxWindow* window);
bool StartDrawingOnTop(wxRect* rect = @NULL); bool StartDrawingOnTop(wxRect* rect = @NULL);
//@} //@}
}; };

48
interface/dcsvg.h
View File

@@ -51,8 +51,8 @@ public:
a filename @e f with size @e Width by @e Height at @e dpi resolution. a filename @e f with size @e Width by @e Height at @e dpi resolution.
*/ */
wxSVGFileDC(wxString f); wxSVGFileDC(wxString f);
wxSVGFileDC(wxString f, int Width, int Height); wxSVGFileDC(wxString f, int Width, int Height);
wxSVGFileDC(wxString f, int Width, int Height, float dpi); wxSVGFileDC(wxString f, int Width, int Height, float dpi);
//@} //@}
/** /**
@@ -159,7 +159,7 @@ public:
*/ */
void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width, void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width,
wxCoord height); wxCoord height);
void DrawCheckMark(const wxRect & rect); void DrawCheckMark(const wxRect & rect);
//@} //@}
//@{ //@{
@@ -169,7 +169,7 @@ public:
@sa wxDC::DrawEllipse @sa wxDC::DrawEllipse
*/ */
void DrawCircle(wxCoord x, wxCoord y, wxCoord radius); void DrawCircle(wxCoord x, wxCoord y, wxCoord radius);
void DrawCircle(const wxPoint& pt, wxCoord radius); void DrawCircle(const wxPoint& pt, wxCoord radius);
//@} //@}
//@{ //@{
@@ -182,8 +182,8 @@ public:
*/ */
void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, void DrawEllipse(wxCoord x, wxCoord y, wxCoord width,
wxCoord height); wxCoord height);
void DrawEllipse(const wxPoint& pt, const wxSize& size); void DrawEllipse(const wxPoint& pt, const wxSize& size);
void DrawEllipse(const wxRect& rect); void DrawEllipse(const wxRect& rect);
//@} //@}
/** /**
@@ -231,8 +231,8 @@ public:
*/ */
void DrawLines(int n, wxPoint points[], wxCoord xoffset = 0, void DrawLines(int n, wxPoint points[], wxCoord xoffset = 0,
wxCoord yoffset = 0); wxCoord yoffset = 0);
void DrawLines(wxList * points, wxCoord xoffset = 0, void DrawLines(wxList * points, wxCoord xoffset = 0,
wxCoord yoffset = 0); wxCoord yoffset = 0);
//@} //@}
/** /**
@@ -257,9 +257,9 @@ public:
void DrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, void DrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0,
wxCoord yoffset = 0, wxCoord yoffset = 0,
int fill_style = wxODDEVEN_RULE); int fill_style = wxODDEVEN_RULE);
void DrawPolygon(wxList * points, wxCoord xoffset = 0, void DrawPolygon(wxList * points, wxCoord xoffset = 0,
wxCoord yoffset = 0, wxCoord yoffset = 0,
int fill_style = wxODDEVEN_RULE); int fill_style = wxODDEVEN_RULE);
//@} //@}
/** /**
@@ -302,10 +302,10 @@ public:
Draws a three-point spline using the current pen. Draws a three-point spline using the current pen.
*/ */
void DrawSpline(wxList * points); void DrawSpline(wxList * points);
void DrawSpline(wxCoord x1, wxCoord y1, wxCoord x2, void DrawSpline(wxCoord x1, wxCoord y1, wxCoord x2,
wxCoord y2, wxCoord y2,
wxCoord x3, wxCoord x3,
wxCoord y3); wxCoord y3);
//@} //@}
/** /**
@@ -346,7 +346,7 @@ public:
wxSVGFileDC::SetBackground). wxSVGFileDC::SetBackground).
*/ */
wxBrush GetBackground(); wxBrush GetBackground();
const wxBrush GetBackground(); const wxBrush GetBackground();
//@} //@}
/** /**
@@ -361,7 +361,7 @@ public:
Gets the current brush (see wxSVGFileDC::SetBrush). Gets the current brush (see wxSVGFileDC::SetBrush).
*/ */
wxBrush GetBrush(); wxBrush GetBrush();
const wxBrush GetBrush(); const wxBrush GetBrush();
//@} //@}
/** /**
@@ -385,7 +385,7 @@ public:
Gets the current font (see wxSVGFileDC::SetFont). Gets the current font (see wxSVGFileDC::SetFont).
*/ */
wxFont GetFont(); wxFont GetFont();
const wxFont GetFont(); const wxFont GetFont();
//@} //@}
/** /**
@@ -403,7 +403,7 @@ public:
Gets the current pen (see wxSVGFileDC::SetPen). Gets the current pen (see wxSVGFileDC::SetPen).
*/ */
wxPen GetPen(); wxPen GetPen();
const wxPen GetPen(); const wxPen GetPen();
//@} //@}
/** /**
@@ -422,7 +422,7 @@ public:
Gets the current text background colour (see wxSVGFileDC::SetTextBackground). Gets the current text background colour (see wxSVGFileDC::SetTextBackground).
*/ */
wxColour GetTextBackground(); wxColour GetTextBackground();
const wxColour GetTextBackground(); const wxColour GetTextBackground();
//@} //@}
/** /**
@@ -451,7 +451,7 @@ public:
Gets the current text foreground colour (see wxSVGFileDC::SetTextForeground). Gets the current text foreground colour (see wxSVGFileDC::SetTextForeground).
*/ */
wxColour GetTextForeground(); wxColour GetTextForeground();
const wxColour GetTextForeground(); const wxColour GetTextForeground();
//@} //@}
/** /**
@@ -565,9 +565,9 @@ public:
*/ */
void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width,
wxCoord height); wxCoord height);
void SetClippingRegion(const wxPoint& pt, const wxSize& sz); void SetClippingRegion(const wxPoint& pt, const wxSize& sz);
void SetClippingRegion(const wxRect& rect); void SetClippingRegion(const wxRect& rect);
void SetClippingRegion(const wxRegion& region); void SetClippingRegion(const wxRegion& region);
//@} //@}
/** /**

20
interface/dde.h
View File

@@ -51,7 +51,7 @@ public:
transactions. transactions.
*/ */
wxDDEConnection(); wxDDEConnection();
wxDDEConnection(void* buffer, size_t size); wxDDEConnection(void* buffer, size_t size);
//@} //@}
//@{ //@{
@@ -63,9 +63,9 @@ public:
*/ */
bool Advise(const wxString& item, const void* data, size_t size, bool Advise(const wxString& item, const void* data, size_t size,
wxIPCFormat format = wxIPC_PRIVATE); wxIPCFormat format = wxIPC_PRIVATE);
bool Advise(const wxString& item, const char* data); bool Advise(const wxString& item, const char* data);
bool Advise(const wxString& item, const wchar_t* data); bool Advise(const wxString& item, const wchar_t* data);
bool Advise(const wxString& item, const wxString data); bool Advise(const wxString& item, const wxString data);
//@} //@}
/** /**
@@ -89,9 +89,9 @@ public:
*/ */
bool Execute(const void* data, size_t size, bool Execute(const void* data, size_t size,
wxIPCFormat format = wxIPC_PRIVATE); wxIPCFormat format = wxIPC_PRIVATE);
bool Execute(const char* data); bool Execute(const char* data);
bool Execute(const wchar_t* data); bool Execute(const wchar_t* data);
bool Execute(const wxString data); bool Execute(const wxString data);
//@} //@}
/** /**
@@ -166,9 +166,9 @@ public:
*/ */
bool Poke(const wxString& item, const void* data, size_t size, bool Poke(const wxString& item, const void* data, size_t size,
wxIPCFormat format = wxIPC_PRIVATE); wxIPCFormat format = wxIPC_PRIVATE);
bool Poke(const wxString& item, const char* data); bool Poke(const wxString& item, const char* data);
bool Poke(const wxString& item, const wchar_t* data); bool Poke(const wxString& item, const wchar_t* data);
bool Poke(const wxString& item, const wxString data); bool Poke(const wxString& item, const wxString data);
//@} //@}
/** /**

36
interface/debug.h
View File

@@ -1,29 +1,29 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: debug.h // Name: debug.h
// Purpose: documentation for global functions // Purpose: documentation for global functions
// Author: wxWidgets team // Author: wxWidgets team
// RCS-ID: $Id$ // RCS-ID: $Id$
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** /**
Will always generate an assert error if this code is reached (in debug mode). Will always generate an assert error if this code is reached (in debug mode).
See also: wxFAIL_MSG See also: wxFAIL_MSG
*/ */
#define wxFAIL() /* implementation is private */ #define wxFAIL() /* implementation is private */
/** /**
This function is called whenever one of debugging macros fails (i.e. condition This function is called whenever one of debugging macros fails (i.e. condition
is @false in an assertion). It is only defined in the debug mode, in release is @false in an assertion). It is only defined in the debug mode, in release
builds the wxCHECK failures don't result in anything. builds the wxCHECK failures don't result in anything.
To override the default behaviour in the debug builds which is to show the user To override the default behaviour in the debug builds which is to show the user
a dialog asking whether he wants to abort the program, continue or continue a dialog asking whether he wants to abort the program, continue or continue
ignoring any subsequent assert failures, you may override ignoring any subsequent assert failures, you may override
wxApp::OnAssertFailure which is called by this function if wxApp::OnAssertFailure which is called by this function if
the global application object exists. the global application object exists.
*/ */
void wxOnAssert(const char * fileName, int lineNumber, void wxOnAssert(const char * fileName, int lineNumber,
const char * func, const char * func,

34
interface/defs.h
View File

@@ -1,25 +1,25 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: defs.h // Name: defs.h
// Purpose: documentation for global functions // Purpose: documentation for global functions
// Author: wxWidgets team // Author: wxWidgets team
// RCS-ID: $Id$ // RCS-ID: $Id$
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
//@{ //@{
/** /**
These macros will swap the bytes of the @e value variable from little These macros will swap the bytes of the @e value variable from little
endian to big endian or vice versa unconditionally, i.e. independently of the endian to big endian or vice versa unconditionally, i.e. independently of the
current platform. current platform.
*/ */
wxInt32 wxINT32_SWAP_ALWAYS(wxInt32 value); wxInt32 wxINT32_SWAP_ALWAYS(wxInt32 value);
wxUint32 wxUINT32_SWAP_ALWAYS(wxUint32 value); wxUint32 wxUINT32_SWAP_ALWAYS(wxUint32 value);
wxInt16 wxINT16_SWAP_ALWAYS(wxInt16 value); wxInt16 wxINT16_SWAP_ALWAYS(wxInt16 value);
wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value); wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value);
//@} //@}
//@{ //@{
/** /**
This macro will swap the bytes of the @e value variable from little This macro will swap the bytes of the @e value variable from little
endian to big endian or vice versa if the program is compiled on a endian to big endian or vice versa if the program is compiled on a
@@ -30,9 +30,9 @@ wxInt32 wxINT32_SWAP_ALWAYS(wxInt32 value);
data in big-endian format. data in big-endian format.
*/ */
wxInt32 wxINT32_SWAP_ON_LE(wxInt32 value); wxInt32 wxINT32_SWAP_ON_LE(wxInt32 value);
wxUint32 wxUINT32_SWAP_ON_LE(wxUint32 value); wxUint32 wxUINT32_SWAP_ON_LE(wxUint32 value);
wxInt16 wxINT16_SWAP_ON_LE(wxInt16 value); wxInt16 wxINT16_SWAP_ON_LE(wxInt16 value);
wxUint16 wxUINT16_SWAP_ON_LE(wxUint16 value); wxUint16 wxUINT16_SWAP_ON_LE(wxUint16 value);
//@} //@}
/** /**
@@ -100,9 +100,9 @@ wxInt32 wxINT32_SWAP_ON_LE(wxInt32 value);
data in little-endian (for example Intel i386) format. data in little-endian (for example Intel i386) format.
*/ */
wxInt32 wxINT32_SWAP_ON_BE(wxInt32 value); wxInt32 wxINT32_SWAP_ON_BE(wxInt32 value);
wxUint32 wxUINT32_SWAP_ON_BE(wxUint32 value); wxUint32 wxUINT32_SWAP_ON_BE(wxUint32 value);
wxInt16 wxINT16_SWAP_ON_BE(wxInt16 value); wxInt16 wxINT16_SWAP_ON_BE(wxInt16 value);
wxUint16 wxUINT16_SWAP_ON_BE(wxUint16 value); wxUint16 wxUINT16_SWAP_ON_BE(wxUint16 value);
//@} //@}
/** /**

12
interface/dialog.h
View File

@@ -99,12 +99,12 @@ public:
@sa Create() @sa Create()
*/ */
wxDialog(); wxDialog();
wxDialog(wxWindow* parent, wxWindowID id, wxDialog(wxWindow* parent, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = "dialogBox"); const wxString& name = "dialogBox");
//@} //@}
/** /**

2
interface/dir.h
View File

@@ -130,7 +130,7 @@ public:
to test for errors. to test for errors.
*/ */
wxDir(); wxDir();
wxDir(const wxString& dir); wxDir(const wxString& dir);
//@} //@}
/** /**

16
interface/dirctrl.h
View File

@@ -59,14 +59,14 @@ public:
The window name. The window name.
*/ */
wxGenericDirCtrl(); wxGenericDirCtrl();
wxGenericDirCtrl(wxWindow* parent, const wxWindowID id = -1, wxGenericDirCtrl(wxWindow* parent, const wxWindowID id = -1,
const wxString& dir = wxDirDialogDefaultFolderStr, const wxString& dir = wxDirDialogDefaultFolderStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_3D_INTERNAL|wxBORDER_SUNKEN, long style = wxDIRCTRL_3D_INTERNAL|wxBORDER_SUNKEN,
const wxString& filter = wxEmptyString, const wxString& filter = wxEmptyString,
int defaultFilter = 0, int defaultFilter = 0,
const wxString& name = wxTreeCtrlNameStr); const wxString& name = wxTreeCtrlNameStr);
//@} //@}
/** /**

8
interface/dnd.h
View File

@@ -223,10 +223,10 @@ public:
const wxIconOrCursor& iconCopy = wxNullIconOrCursor, const wxIconOrCursor& iconCopy = wxNullIconOrCursor,
const wxIconOrCursor& iconMove = wxNullIconOrCursor, const wxIconOrCursor& iconMove = wxNullIconOrCursor,
const wxIconOrCursor& iconNone = wxNullIconOrCursor); const wxIconOrCursor& iconNone = wxNullIconOrCursor);
wxDropSource(wxDataObject& data, wxWindow* win = @NULL, wxDropSource(wxDataObject& data, wxWindow* win = @NULL,
const wxIconOrCursor& iconCopy = wxNullIconOrCursor, const wxIconOrCursor& iconCopy = wxNullIconOrCursor,
const wxIconOrCursor& iconMove = wxNullIconOrCursor, const wxIconOrCursor& iconMove = wxNullIconOrCursor,
const wxIconOrCursor& iconNone = wxNullIconOrCursor); const wxIconOrCursor& iconNone = wxNullIconOrCursor);
//@} //@}
/** /**

14
interface/docmdi.h
View File

@@ -33,13 +33,13 @@ public:
Constructor. Constructor.
*/ */
wxDocMDIParentFrame(); wxDocMDIParentFrame();
wxDocMDIParentFrame(wxDocManager* manager, wxFrame * parent, wxDocMDIParentFrame(wxDocManager* manager, wxFrame * parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = "frame"); const wxString& name = "frame");
//@} //@}
/** /**

22
interface/docview.h
View File

@@ -393,7 +393,7 @@ public:
Appends the files in the history list, to the given menu only. Appends the files in the history list, to the given menu only.
*/ */
void FileHistoryAddFilesToMenu(); void FileHistoryAddFilesToMenu();
void FileHistoryAddFilesToMenu(wxMenu* menu); void FileHistoryAddFilesToMenu(wxMenu* menu);
//@} //@}
/** /**
@@ -983,13 +983,13 @@ public:
Constructor. Constructor.
*/ */
wxDocParentFrame(); wxDocParentFrame();
wxDocParentFrame(wxDocManager* manager, wxFrame * parent, wxDocParentFrame(wxDocManager* manager, wxFrame * parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = "frame"); const wxString& name = "frame");
//@} //@}
/** /**
@@ -1162,7 +1162,7 @@ public:
was configured. was configured.
*/ */
virtual istream LoadObject(istream& stream); virtual istream LoadObject(istream& stream);
virtual wxInputStream LoadObject(wxInputStream& stream); virtual wxInputStream LoadObject(wxInputStream& stream);
//@} //@}
/** /**
@@ -1267,7 +1267,7 @@ public:
was configured. was configured.
*/ */
virtual ostream SaveObject(ostream& stream); virtual ostream SaveObject(ostream& stream);
virtual wxOutputStream SaveObject(wxOutputStream& stream); virtual wxOutputStream SaveObject(wxOutputStream& stream);
//@} //@}
/** /**
@@ -1423,7 +1423,7 @@ public:
Appends the files in the history list, to the given menu only. Appends the files in the history list, to the given menu only.
*/ */
void AddFilesToMenu(); void AddFilesToMenu();
void AddFilesToMenu(wxMenu* menu); void AddFilesToMenu(wxMenu* menu);
//@} //@}
/** /**

22
interface/dragimag.h
View File

@@ -79,15 +79,15 @@ public:
Tree or list control item id. Tree or list control item id.
*/ */
wxDragImage(); wxDragImage();
wxDragImage(const wxBitmap& image, wxDragImage(const wxBitmap& image,
const wxCursor& cursor = wxNullCursor); const wxCursor& cursor = wxNullCursor);
wxDragImage(const wxIcon& image, wxDragImage(const wxIcon& image,
const wxCursor& cursor = wxNullCursor); const wxCursor& cursor = wxNullCursor);
wxDragImage(const wxString& text, wxDragImage(const wxString& text,
const wxCursor& cursor = wxNullCursor); const wxCursor& cursor = wxNullCursor);
wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id); wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id);
wxDragImage(const wxListCtrl& treeCtrl, long id); wxDragImage(const wxListCtrl& treeCtrl, long id);
wxDragImage(const wxCursor& cursor = wxNullCursor); wxDragImage(const wxCursor& cursor = wxNullCursor);
//@} //@}
//@{ //@{
@@ -133,8 +133,8 @@ public:
bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool BeginDrag(const wxPoint& hotspot, wxWindow* window,
bool fullScreen = @false, bool fullScreen = @false,
wxRect* rect = @NULL); wxRect* rect = @NULL);
bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool BeginDrag(const wxPoint& hotspot, wxWindow* window,
wxWindow* boundingWindow); wxWindow* boundingWindow);
//@} //@}
/** /**

64
interface/dynarray.h
View File

@@ -178,9 +178,9 @@ public:
append a lot of items. append a lot of items.
*/ */
void Add(T item, size_t copies = 1); void Add(T item, size_t copies = 1);
size_t Add(T item); size_t Add(T item);
void Add(T * item); void Add(T * item);
void Add(T & item, size_t copies = 1); void Add(T & item, size_t copies = 1);
//@} //@}
/** /**
@@ -255,9 +255,9 @@ public:
should return a negative, zero or positive value according to whether the first should return a negative, zero or positive value according to whether the first
element passed to it is less than, equal to or greater than the second one. element passed to it is less than, equal to or greater than the second one.
*/ */
wxArray(); wxArray();
wxObjArray(); wxObjArray();
wxSortedArray(); wxSortedArray();
//@} //@}
/** /**
@@ -301,7 +301,7 @@ public:
in the array. in the array.
*/ */
int Index(T& item, bool searchFromEnd = @false); int Index(T& item, bool searchFromEnd = @false);
int Index(T& item); int Index(T& item);
//@} //@}
/** /**
@@ -331,8 +331,8 @@ public:
between the overloaded versions of this function. between the overloaded versions of this function.
*/ */
void Insert(T item, size_t n, size_t copies = 1); void Insert(T item, size_t n, size_t copies = 1);
void Insert(T * item, size_t n); void Insert(T * item, size_t n);
void Insert(T & item, size_t n, size_t copies = 1); void Insert(T & item, size_t n, size_t copies = 1);
//@} //@}
/** /**
@@ -475,7 +475,7 @@ public:
See also WX_CLEAR_ARRAY macro which deletes all See also WX_CLEAR_ARRAY macro which deletes all
elements of a wxArray (supposed to contain pointers). elements of a wxArray (supposed to contain pointers).
*/ */
Remove(T item); Remove(T item);
/** /**
Removes @e count elements starting at @e index from the array. When an Removes @e count elements starting at @e index from the array. When an
@@ -486,7 +486,7 @@ public:
See also WX_CLEAR_ARRAY macro which deletes all See also WX_CLEAR_ARRAY macro which deletes all
elements of a wxArray (supposed to contain pointers). elements of a wxArray (supposed to contain pointers).
*/ */
RemoveAt(size_t index, size_t count = 1); RemoveAt(size_t index, size_t count = 1);
/** /**
WX_CLEAR_ARRAY WX_CLEAR_ARRAY
@@ -567,9 +567,9 @@ public:
You must use WX_DEFINE_OBJARRAY macro to define You must use WX_DEFINE_OBJARRAY macro to define
the array class - otherwise you would get link errors. the array class - otherwise you would get link errors.
*/ */
WX_DECLARE_OBJARRAY(T, name); WX_DECLARE_OBJARRAY(T, name);
WX_DECLARE_EXPORTED_OBJARRAY(T, name); WX_DECLARE_EXPORTED_OBJARRAY(T, name);
WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name); WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name);
//@} //@}
//@{ //@{
@@ -584,9 +584,9 @@ public:
wxArrayInt, wxArrayInt,
@b wxArrayLong, @b wxArrayShort, @b wxArrayDouble, @b wxArrayPtrVoid. @b wxArrayLong, @b wxArrayShort, @b wxArrayDouble, @b wxArrayPtrVoid.
*/ */
WX_DEFINE_ARRAY(T, name); WX_DEFINE_ARRAY(T, name);
WX_DEFINE_EXPORTED_ARRAY(T, name); WX_DEFINE_EXPORTED_ARRAY(T, name);
WX_DEFINE_USER_EXPORTED_ARRAY(T, name, exportspec); WX_DEFINE_USER_EXPORTED_ARRAY(T, name, exportspec);
//@} //@}
//@{ //@{
@@ -603,9 +603,9 @@ public:
Example of usage: Example of usage:
*/ */
WX_DEFINE_OBJARRAY(name); WX_DEFINE_OBJARRAY(name);
WX_DEFINE_EXPORTED_OBJARRAY(name); WX_DEFINE_EXPORTED_OBJARRAY(name);
WX_DEFINE_USER_EXPORTED_OBJARRAY(name); WX_DEFINE_USER_EXPORTED_OBJARRAY(name);
//@} //@}
//@{ //@{
@@ -619,9 +619,9 @@ public:
You will have to initialize the objects of this class by passing a comparison You will have to initialize the objects of this class by passing a comparison
function to the array object constructor like this: function to the array object constructor like this:
*/ */
WX_DEFINE_SORTED_ARRAY(T, name); WX_DEFINE_SORTED_ARRAY(T, name);
WX_DEFINE_SORTED_EXPORTED_ARRAY(T, name); WX_DEFINE_SORTED_EXPORTED_ARRAY(T, name);
WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(T, name); WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(T, name);
//@} //@}
/** /**
@@ -637,12 +637,12 @@ public:
the items of pointer type) for wxArray and wxSortedArray and a deep copy (i.e. the items of pointer type) for wxArray and wxSortedArray and a deep copy (i.e.
the array element are copied too) for wxObjArray. the array element are copied too) for wxObjArray.
*/ */
wxArray(const wxArray& array); wxArray(const wxArray& array);
wxSortedArray(const wxSortedArray& array); wxSortedArray(const wxSortedArray& array);
wxObjArray(const wxObjArray& array); wxObjArray(const wxObjArray& array);
wxArray operator=(const wxArray& array); wxArray operator=(const wxArray& array);
wxSortedArray operator=(const wxSortedArray& array); wxSortedArray operator=(const wxSortedArray& array);
wxObjArray operator=(const wxObjArray& array); wxObjArray operator=(const wxObjArray& array);
//@} //@}
//@{ //@{
@@ -651,8 +651,8 @@ public:
done by wxArray and wxSortedArray versions - you may use done by wxArray and wxSortedArray versions - you may use
WX_CLEAR_ARRAY macro for this. WX_CLEAR_ARRAY macro for this.
*/ */
~wxArray(); ~wxArray();
~wxSortedArray(); ~wxSortedArray();
~wxObjArray(); ~wxObjArray();
//@} //@}
}; };

6
interface/dynlib.h
View File

@@ -215,8 +215,8 @@ public:
Constructor. Second form calls Load(). Constructor. Second form calls Load().
*/ */
wxDynamicLibrary(); wxDynamicLibrary();
wxDynamicLibrary(const wxString& name, wxDynamicLibrary(const wxString& name,
int flags = wxDL_DEFAULT); int flags = wxDL_DEFAULT);
//@} //@}
/** /**
@@ -380,7 +380,7 @@ public:
the handle somewhere and call this static method later to unload it. the handle somewhere and call this static method later to unload it.
*/ */
void Unload(); void Unload();
static void Unload(wxDllType handle); static void Unload(wxDllType handle);
//@} //@}
}; };

12
interface/editlbox.h
View File

@@ -64,12 +64,12 @@ public:
@sa Create() @sa Create()
*/ */
wxEditableListBox(); wxEditableListBox();
wxEditableListBox(wxWindow* parent, wxWindowID id, wxEditableListBox(wxWindow* parent, wxWindowID id,
const wxString& label, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxEL_DEFAULT_STYLE, long style = wxEL_DEFAULT_STYLE,
const wxString& name = "editableListBox"); const wxString& name = "editableListBox");
//@} //@}
/** /**

14
interface/encconv.h
View File

@@ -48,12 +48,12 @@ public:
Convert wxString and return new wxString object. Convert wxString and return new wxString object.
*/ */
bool Convert(const char* input, char* output); bool Convert(const char* input, char* output);
bool Convert(const wchar_t* input, wchar_t* output); bool Convert(const wchar_t* input, wchar_t* output);
bool Convert(const char* input, wchar_t* output); bool Convert(const char* input, wchar_t* output);
bool Convert(const wchar_t* input, char* output); bool Convert(const wchar_t* input, char* output);
bool Convert(char* str); bool Convert(char* str);
bool Convert(wchar_t* str); bool Convert(wchar_t* str);
wxString Convert(const wxString& input); wxString Convert(const wxString& input);
//@} //@}
/** /**
@@ -93,7 +93,7 @@ public:
encodings. (It usually returns only one encoding.) encodings. (It usually returns only one encoding.)
*/ */
static wxFontEncodingArray GetPlatformEquivalents(wxFontEncoding enc, static wxFontEncodingArray GetPlatformEquivalents(wxFontEncoding enc,
int platform = wxPLATFORM_CURRENT); int platform = wxPLATFORM_CURRENT);
/** /**
Initialize conversion. Both output or input encoding may Initialize conversion. Both output or input encoding may

44
interface/event.h
View File

@@ -138,7 +138,7 @@ public:
Obtains the position (in client coordinates) at which the key was pressed. Obtains the position (in client coordinates) at which the key was pressed.
*/ */
wxPoint GetPosition(); wxPoint GetPosition();
void GetPosition(long * x, long * y); void GetPosition(long * x, long * y);
//@} //@}
/** /**
@@ -966,8 +966,8 @@ public:
returned position is @c wxDefaultPosition. returned position is @c wxDefaultPosition.
*/ */
wxPoint GetPosition(); wxPoint GetPosition();
void GetPosition(wxCoord* x, wxCoord* y); void GetPosition(wxCoord* x, wxCoord* y);
void GetPosition(long* x, long* y); void GetPosition(long* x, long* y);
//@} //@}
/** /**
@@ -1966,7 +1966,7 @@ public:
Constructor. Constructor.
*/ */
wxNavigationKeyEvent(); wxNavigationKeyEvent();
wxNavigationKeyEvent(const wxNavigationKeyEvent& event); wxNavigationKeyEvent(const wxNavigationKeyEvent& event);
//@} //@}
/** /**
@@ -2327,14 +2327,14 @@ public:
wxObjectEventFunction function, wxObjectEventFunction function,
wxObject* userData = @NULL, wxObject* userData = @NULL,
wxEvtHandler* eventSink = @NULL); wxEvtHandler* eventSink = @NULL);
void Connect(int id, wxEventType eventType, void Connect(int id, wxEventType eventType,
wxObjectEventFunction function, wxObjectEventFunction function,
wxObject* userData = @NULL, wxObject* userData = @NULL,
wxEvtHandler* eventSink = @NULL); wxEvtHandler* eventSink = @NULL);
void Connect(wxEventType eventType, void Connect(wxEventType eventType,
wxObjectEventFunction function, wxObjectEventFunction function,
wxObject* userData = @NULL, wxObject* userData = @NULL,
wxEvtHandler* eventSink = @NULL); wxEvtHandler* eventSink = @NULL);
//@} //@}
//@{ //@{
@@ -2371,16 +2371,16 @@ public:
wxObjectEventFunction function = @NULL, wxObjectEventFunction function = @NULL,
wxObject* userData = @NULL, wxObject* userData = @NULL,
wxEvtHandler* eventSink = @NULL); wxEvtHandler* eventSink = @NULL);
bool Disconnect(int id = wxID_ANY, bool Disconnect(int id = wxID_ANY,
wxEventType eventType = wxEVT_@NULL, wxEventType eventType = wxEVT_@NULL,
wxObjectEventFunction function = @NULL, wxObjectEventFunction function = @NULL,
wxObject* userData = @NULL, wxObject* userData = @NULL,
wxEvtHandler* eventSink = @NULL); wxEvtHandler* eventSink = @NULL);
bool Disconnect(int id, int lastId = wxID_ANY, bool Disconnect(int id, int lastId = wxID_ANY,
wxEventType eventType = wxEVT_@NULL, wxEventType eventType = wxEVT_@NULL,
wxObjectEventFunction function = @NULL, wxObjectEventFunction function = @NULL,
wxObject* userData = @NULL, wxObject* userData = @NULL,
wxEvtHandler* eventSink = @NULL); wxEvtHandler* eventSink = @NULL);
//@} //@}
/** /**

8
interface/fdrepdlg.h
View File

@@ -133,10 +133,10 @@ public:
The @e parent and @e data parameters must be non-@NULL. The @e parent and @e data parameters must be non-@NULL.
*/ */
wxFindReplaceDialog(); wxFindReplaceDialog();
wxFindReplaceDialog(wxWindow * parent, wxFindReplaceDialog(wxWindow * parent,
wxFindReplaceData* data, wxFindReplaceData* data,
const wxString& title, const wxString& title,
int style = 0); int style = 0);
//@} //@}
/** /**

4
interface/ffile.h
View File

@@ -42,8 +42,8 @@ public:
An existing file descriptor, such as stderr. An existing file descriptor, such as stderr.
*/ */
wxFFile(); wxFFile();
wxFFile(const wxString& filename, const wxString& mode = "r"); wxFFile(const wxString& filename, const wxString& mode = "r");
wxFFile(FILE* fp); wxFFile(FILE* fp);
//@} //@}
/** /**

10
interface/file.h
View File

@@ -161,9 +161,9 @@ public:
descriptors) descriptors)
*/ */
wxFile(); wxFile();
wxFile(const wxString& filename, wxFile(const wxString& filename,
wxFile::OpenMode mode = wxFile::read); wxFile::OpenMode mode = wxFile::read);
wxFile(int fd); wxFile(int fd);
//@} //@}
/** /**
@@ -278,8 +278,8 @@ public:
if there was an error. if there was an error.
*/ */
size_t Read(void* buffer, size_t count); size_t Read(void* buffer, size_t count);
Parameters Return value Parameters Return value
The number of bytes read, or the symbol wxInvalidOffset(); The number of bytes read, or the symbol wxInvalidOffset();
//@} //@}
/** /**

18
interface/filectrl.h
View File

@@ -75,14 +75,14 @@ public:
creation failed. creation failed.
*/ */
wxFileCtrl(); wxFileCtrl();
wxFileCtrl(wxWindow * parent, wxWindowID id, wxFileCtrl(wxWindow * parent, wxWindowID id,
const wxString& defaultDirectory = wxEmptyString, const wxString& defaultDirectory = wxEmptyString,
const wxString& defaultFilename = wxEmptyString, const wxString& defaultFilename = wxEmptyString,
const wxPoint& wildCard = wxFileSelectorDefaultWildcardStr, const wxPoint& wildCard = wxFileSelectorDefaultWildcardStr,
long style = wxFC_DEFAULT_STYLE, long style = wxFC_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const wxString& name = "filectrl"); const wxString& name = "filectrl");
//@} //@}
/** /**
@@ -219,5 +219,5 @@ public:
/** /**
Sets the files changed by this event. Sets the files changed by this event.
*/ */
wxFileCtrlEvent::SetFiles(const wxArrayString files); wxFileCtrlEvent::SetFiles(const wxArrayString files);
}; };

10
interface/filefn.h
View File

@@ -32,7 +32,7 @@ public:
Constructs the object calling the Add() function. Constructs the object calling the Add() function.
*/ */
wxPathList(); wxPathList();
wxPathList(const wxArrayString& arr); wxPathList(const wxArrayString& arr);
//@} //@}
//@{ //@{
@@ -54,7 +54,7 @@ public:
(this is why FindValidPath() may return relative paths). (this is why FindValidPath() may return relative paths).
*/ */
bool Add(const wxString& path); bool Add(const wxString& path);
void Add(const wxArrayString& arr); void Add(const wxArrayString& arr);
//@} //@}
/** /**
@@ -212,7 +212,7 @@ time_t wxFileModificationTime(const wxString& filename);
temporary storage that should not be deallocated. temporary storage that should not be deallocated.
*/ */
wxString wxFileNameFromPath(const wxString& path); wxString wxFileNameFromPath(const wxString& path);
char * wxFileNameFromPath(char * path); char * wxFileNameFromPath(char * path);
//@} //@}
/** /**
@@ -343,7 +343,7 @@ wxString wxFindFirstFile(const wxString& spec, int flags = 0);
@endcode @endcode
*/ */
wxFileKind wxGetFileKind(int fd); wxFileKind wxGetFileKind(int fd);
wxFileKind wxGetFileKind(FILE * fp); wxFileKind wxGetFileKind(FILE * fp);
//@} //@}
//@{ //@{
@@ -353,7 +353,7 @@ wxFileKind wxGetFileKind(int fd);
instead. instead.
*/ */
char * wxGetTempFileName(const wxString& prefix, char * buf=@NULL); char * wxGetTempFileName(const wxString& prefix, char * buf=@NULL);
bool wxGetTempFileName(const wxString& prefix, wxString& buf); bool wxGetTempFileName(const wxString& prefix, wxString& buf);
//@} //@}
/** /**

122
interface/filename.h
View File

@@ -73,18 +73,18 @@ public:
Constructor from a volume name, a directory name, base file name and extension. Constructor from a volume name, a directory name, base file name and extension.
*/ */
wxFileName(); wxFileName();
wxFileName(const wxFileName& filename); wxFileName(const wxFileName& filename);
wxFileName(const wxString& fullpath, wxFileName(const wxString& fullpath,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
wxFileName(const wxString& path, const wxString& name, wxFileName(const wxString& path, const wxString& name,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
wxFileName(const wxString& path, const wxString& name, wxFileName(const wxString& path, const wxString& name,
const wxString& ext, const wxString& ext,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
wxFileName(const wxString& volume, const wxString& path, wxFileName(const wxString& volume, const wxString& path,
const wxString& name, const wxString& name,
const wxString& ext, const wxString& ext,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
//@} //@}
/** /**
@@ -100,22 +100,22 @@ public:
Creates the file name from various combinations of data. Creates the file name from various combinations of data.
*/ */
void Assign(const wxFileName& filepath); void Assign(const wxFileName& filepath);
void Assign(const wxString& fullpath, void Assign(const wxString& fullpath,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
void Assign(const wxString& volume, const wxString& path, void Assign(const wxString& volume, const wxString& path,
const wxString& name, const wxString& name,
const wxString& ext, const wxString& ext,
bool hasExt, bool hasExt,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
void Assign(const wxString& volume, const wxString& path, void Assign(const wxString& volume, const wxString& path,
const wxString& name, const wxString& name,
const wxString& ext, const wxString& ext,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
void Assign(const wxString& path, const wxString& name, void Assign(const wxString& path, const wxString& name,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
void Assign(const wxString& path, const wxString& name, void Assign(const wxString& path, const wxString& name,
const wxString& ext, const wxString& ext,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
//@} //@}
/** /**
@@ -192,7 +192,7 @@ public:
Returns @true if the directory with this name exists. Returns @true if the directory with this name exists.
*/ */
bool DirExists(); bool DirExists();
static bool DirExists(const wxString& dir); static bool DirExists(const wxString& dir);
//@} //@}
/** /**
@@ -333,7 +333,7 @@ public:
@sa DirExists() @sa DirExists()
*/ */
bool FileExists(); bool FileExists();
static bool FileExists(const wxString& file); static bool FileExists(const wxString& file);
//@} //@}
/** /**
@@ -414,9 +414,9 @@ public:
*/ */
wxString GetHumanReadableSize(const wxString& failmsg = "Not available", wxString GetHumanReadableSize(const wxString& failmsg = "Not available",
int precision = 1); int precision = 1);
static wxString GetHumanReadableSize(const wxULongLong& bytes, static wxString GetHumanReadableSize(const wxULongLong& bytes,
const wxString& nullsize = "Not available", const wxString& nullsize = "Not available",
int precision = 1); int precision = 1);
//@} //@}
/** /**
@@ -508,7 +508,7 @@ public:
by another process) the returned value is @c wxInvalidSize. by another process) the returned value is @c wxInvalidSize.
*/ */
wxULongLong GetSize(); wxULongLong GetSize();
static wxULongLong GetSize(const wxString& filename); static wxULongLong GetSize(const wxString& filename);
//@} //@}
/** /**
@@ -600,7 +600,7 @@ public:
doesn't imply that you have read permissions on the files contained. doesn't imply that you have read permissions on the files contained.
*/ */
bool IsDirReadable(); bool IsDirReadable();
static bool IsDirReadable(const wxString& dir); static bool IsDirReadable(const wxString& dir);
//@} //@}
//@{ //@{
@@ -611,7 +611,7 @@ public:
directory. directory.
*/ */
bool IsDirWritable(); bool IsDirWritable();
static bool IsDirWritable(const wxString& dir); static bool IsDirWritable(const wxString& dir);
//@} //@}
//@{ //@{
@@ -620,7 +620,7 @@ public:
permissions on it. permissions on it.
*/ */
bool IsFileExecutable(); bool IsFileExecutable();
static bool IsFileExecutable(const wxString& file); static bool IsFileExecutable(const wxString& file);
//@} //@}
//@{ //@{
@@ -629,7 +629,7 @@ public:
permissions on it. permissions on it.
*/ */
bool IsFileReadable(); bool IsFileReadable();
static bool IsFileReadable(const wxString& file); static bool IsFileReadable(const wxString& file);
//@} //@}
//@{ //@{
@@ -638,7 +638,7 @@ public:
permissions on it. permissions on it.
*/ */
bool IsFileWritable(); bool IsFileWritable();
static bool IsFileWritable(const wxString& file); static bool IsFileWritable(const wxString& file);
//@} //@}
/** /**
@@ -664,16 +664,16 @@ public:
On Mac OS, gets the common type and creator for the given extension. On Mac OS, gets the common type and creator for the given extension.
*/ */
static bool MacFindDefaultTypeAndCreator(const wxString& ext, static bool MacFindDefaultTypeAndCreator(const wxString& ext,
wxUint32* type, wxUint32* type,
wxUint32* creator); wxUint32* creator);
/** /**
On Mac OS, registers application defined extensions and their default type and On Mac OS, registers application defined extensions and their default type and
creator. creator.
*/ */
static void MacRegisterDefaultTypeAndCreator(const wxString& ext, static void MacRegisterDefaultTypeAndCreator(const wxString& ext,
wxUint32 type, wxUint32 type,
wxUint32 creator); wxUint32 creator);
/** /**
On Mac OS, looks up the appropriate type and creator from the registration and On Mac OS, looks up the appropriate type and creator from the registration and
@@ -732,8 +732,8 @@ public:
otherwise. otherwise.
*/ */
bool Mkdir(int perm = 0777, int flags = 0); bool Mkdir(int perm = 0777, int flags = 0);
static bool Mkdir(const wxString& dir, int perm = 0777, static bool Mkdir(const wxString& dir, int perm = 0777,
int flags = 0); int flags = 0);
//@} //@}
/** /**
@@ -845,7 +845,7 @@ public:
Deletes the specified directory from the file system. Deletes the specified directory from the file system.
*/ */
bool Rmdir(); bool Rmdir();
static bool Rmdir(const wxString& dir); static bool Rmdir(const wxString& dir);
//@} //@}
/** /**
@@ -859,7 +859,7 @@ public:
Changes the current working directory. Changes the current working directory.
*/ */
bool SetCwd(); bool SetCwd();
static bool SetCwd(const wxString& cwd); static bool SetCwd(const wxString& cwd);
//@} //@}
/** /**
@@ -930,17 +930,17 @@ public:
wxString* ext, wxString* ext,
bool hasExt = @NULL, bool hasExt = @NULL,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
static void SplitPath(const wxString& fullpath, static void SplitPath(const wxString& fullpath,
wxString* volume, wxString* volume,
wxString* path, wxString* path,
wxString* name, wxString* name,
wxString* ext, wxString* ext,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
static void SplitPath(const wxString& fullpath, static void SplitPath(const wxString& fullpath,
wxString* path, wxString* path,
wxString* name, wxString* name,
wxString* ext, wxString* ext,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
//@} //@}
/** /**
@@ -965,7 +965,7 @@ public:
is interpreted as a path in the native filename format. is interpreted as a path in the native filename format.
*/ */
bool operator operator!=(const wxFileName& filename); bool operator operator!=(const wxFileName& filename);
bool operator operator!=(const wxString& filename); bool operator operator!=(const wxString& filename);
//@} //@}
//@{ //@{
@@ -973,7 +973,7 @@ public:
Assigns the new value to this filename object. Assigns the new value to this filename object.
*/ */
wxFileName& operator operator=(const wxFileName& filename); wxFileName& operator operator=(const wxFileName& filename);
wxFileName& operator operator=(const wxString& filename); wxFileName& operator operator=(const wxString& filename);
//@} //@}
//@{ //@{
@@ -982,6 +982,6 @@ public:
interpreted as a path in the native filename format. interpreted as a path in the native filename format.
*/ */
bool operator operator==(const wxFileName& filename); bool operator operator==(const wxFileName& filename);
bool operator operator==(const wxString& filename); bool operator operator==(const wxString& filename);
//@} //@}
}; };

54
interface/font.h
View File

@@ -171,17 +171,17 @@ public:
are used. are used.
*/ */
wxFont(); wxFont();
wxFont(const wxFont& font); wxFont(const wxFont& font);
wxFont(int pointSize, wxFontFamily family, int style, wxFont(int pointSize, wxFontFamily family, int style,
wxFontWeight weight, wxFontWeight weight,
const bool underline = @false, const bool underline = @false,
const wxString& faceName = "", const wxString& faceName = "",
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
wxFont(const wxSize& pixelSize, wxFontFamily family, wxFont(const wxSize& pixelSize, wxFontFamily family,
int style, wxFontWeight weight, int style, wxFontWeight weight,
const bool underline = @false, const bool underline = @false,
const wxString& faceName = "", const wxString& faceName = "",
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
//@} //@}
/** /**
@@ -299,22 +299,22 @@ public:
const bool underline = @false, const bool underline = @false,
const wxString& faceName = "", const wxString& faceName = "",
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
static wxFont * New(int pointSize, wxFontFamily family, static wxFont * New(int pointSize, wxFontFamily family,
int flags = wxFONTFLAG_DEFAULT, int flags = wxFONTFLAG_DEFAULT,
const wxString& faceName = "", const wxString& faceName = "",
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
static wxFont * New(const wxSize& pixelSize, static wxFont * New(const wxSize& pixelSize,
wxFontFamily family, wxFontFamily family,
int style, int style,
wxFontWeight weight, wxFontWeight weight,
const bool underline = @false, const bool underline = @false,
const wxString& faceName = "", const wxString& faceName = "",
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
static wxFont * New(const wxSize& pixelSize, static wxFont * New(const wxSize& pixelSize,
wxFontFamily family, wxFontFamily family,
int flags = wxFONTFLAG_DEFAULT, int flags = wxFONTFLAG_DEFAULT,
const wxString& faceName = "", const wxString& faceName = "",
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
//@} //@}
/** /**

8
interface/fontdlg.h
View File

@@ -30,8 +30,8 @@ public:
shown. shown.
*/ */
wxFontDialog(); wxFontDialog();
wxFontDialog(wxWindow* parent); wxFontDialog(wxWindow* parent);
wxFontDialog(wxWindow* parent, const wxFontData& data); wxFontDialog(wxWindow* parent, const wxFontData& data);
//@} //@}
//@{ //@{
@@ -41,7 +41,7 @@ public:
occurred. occurred.
*/ */
bool Create(wxWindow* parent); bool Create(wxWindow* parent);
bool Create(wxWindow* parent, const wxFontData& data); bool Create(wxWindow* parent, const wxFontData& data);
//@} //@}
//@{ //@{
@@ -50,7 +50,7 @@ public:
dialog. dialog.
*/ */
const wxFontData GetFontData(); const wxFontData GetFontData();
wxFontData GetFontData(); wxFontData GetFontData();
//@} //@}
/** /**

8
interface/fontmap.h
View File

@@ -93,10 +93,10 @@ public:
wxNativeEncodingInfo* info, wxNativeEncodingInfo* info,
const wxString& facename = wxEmptyString, const wxString& facename = wxEmptyString,
bool interactive = @true); bool interactive = @true);
bool GetAltForEncoding(wxFontEncoding encoding, bool GetAltForEncoding(wxFontEncoding encoding,
wxFontEncoding* alt_encoding, wxFontEncoding* alt_encoding,
const wxString& facename = wxEmptyString, const wxString& facename = wxEmptyString,
bool interactive = @true); bool interactive = @true);
//@} //@}
/** /**

12
interface/frame.h
View File

@@ -126,12 +126,12 @@ public:
@sa Create() @sa Create()
*/ */
wxFrame(); wxFrame();
wxFrame(wxWindow* parent, wxWindowID id, wxFrame(wxWindow* parent, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = "frame"); const wxString& name = "frame");
//@} //@}
/** /**

14
interface/fs_mem.h
View File

@@ -88,9 +88,9 @@ public:
*/ */
static void AddFile(const wxString& filename, wxImage& image, static void AddFile(const wxString& filename, wxImage& image,
long type); long type);
static void AddFile(const wxString& filename, static void AddFile(const wxString& filename,
const wxBitmap& bitmap, const wxBitmap& bitmap,
long type); long type);
//@} //@}
//@{ //@{
@@ -106,10 +106,10 @@ public:
static void AddFileWithMimeType(const wxString& filename, static void AddFileWithMimeType(const wxString& filename,
const wxString& textdata, const wxString& textdata,
const wxString& mimetype); const wxString& mimetype);
static void AddFileWithMimeType(const wxString& filename, static void AddFileWithMimeType(const wxString& filename,
const void* binarydata, const void* binarydata,
size_t size, size_t size,
const wxString& mimetype); const wxString& mimetype);
//@} //@}
/** /**

12
interface/gauge.h
View File

@@ -75,12 +75,12 @@ public:
@sa Create() @sa Create()
*/ */
wxGauge(); wxGauge();
wxGauge(wxWindow* parent, wxWindowID id, int range, wxGauge(wxWindow* parent, wxWindowID id, int range,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "gauge"); const wxString& name = "gauge");
//@} //@}
/** /**

76
interface/gbsizer.h
View File

@@ -25,7 +25,7 @@ public:
The default is (0,0). The default is (0,0).
*/ */
wxGBPosition(); wxGBPosition();
wxGBPosition(int row, int col); wxGBPosition(int row, int col);
//@} //@}
/** /**
@@ -93,18 +93,18 @@ public:
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = @NULL); wxObject* userData = @NULL);
wxSizerItem* Add(wxSizer* sizer, const wxGBPosition& pos, wxSizerItem* Add(wxSizer* sizer, const wxGBPosition& pos,
const wxGBSpan& span = wxDefaultSpan, const wxGBSpan& span = wxDefaultSpan,
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = @NULL); wxObject* userData = @NULL);
wxSizerItem* Add(int width, int height, wxSizerItem* Add(int width, int height,
const wxGBPosition& pos, const wxGBPosition& pos,
const wxGBSpan& span = wxDefaultSpan, const wxGBSpan& span = wxDefaultSpan,
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = @NULL); wxObject* userData = @NULL);
wxSizerItem* Add(wxGBSizerItem* item); wxSizerItem* Add(wxGBSizerItem* item);
//@} //@}
/** /**
@@ -122,9 +122,9 @@ public:
*/ */
bool CheckForIntersection(wxGBSizerItem* item, bool CheckForIntersection(wxGBSizerItem* item,
wxGBSizerItem* excludeItem = @NULL); wxGBSizerItem* excludeItem = @NULL);
bool CheckForIntersection(const wxGBPosition& pos, bool CheckForIntersection(const wxGBPosition& pos,
const wxGBSpan& span, const wxGBSpan& span,
wxGBSizerItem* excludeItem = @NULL); wxGBSizerItem* excludeItem = @NULL);
//@} //@}
//@{ //@{
@@ -133,7 +133,7 @@ public:
not found. (non-recursive) not found. (non-recursive)
*/ */
wxGBSizerItem* FindItem(wxWindow* window); wxGBSizerItem* FindItem(wxWindow* window);
wxGBSizerItem* FindItem(wxSizer* sizer); wxGBSizerItem* FindItem(wxSizer* sizer);
//@} //@}
/** /**
@@ -172,8 +172,8 @@ public:
Get the grid position of the specified item. Get the grid position of the specified item.
*/ */
wxGBPosition GetItemPosition(wxWindow* window); wxGBPosition GetItemPosition(wxWindow* window);
wxGBPosition GetItemPosition(wxSizer* sizer); wxGBPosition GetItemPosition(wxSizer* sizer);
wxGBPosition GetItemPosition(size_t index); wxGBPosition GetItemPosition(size_t index);
//@} //@}
//@{ //@{
@@ -181,8 +181,8 @@ public:
Get the row/col spanning of the specified item Get the row/col spanning of the specified item
*/ */
wxGBSpan GetItemSpan(wxWindow* window); wxGBSpan GetItemSpan(wxWindow* window);
wxGBSpan GetItemSpan(wxSizer* sizer); wxGBSpan GetItemSpan(wxSizer* sizer);
wxGBSpan GetItemSpan(size_t index); wxGBSpan GetItemSpan(size_t index);
//@} //@}
/** /**
@@ -203,8 +203,8 @@ public:
@false is returned. @false is returned.
*/ */
bool SetItemPosition(wxWindow* window, const wxGBPosition& pos); bool SetItemPosition(wxWindow* window, const wxGBPosition& pos);
bool SetItemPosition(wxSizer* sizer, const wxGBPosition& pos); bool SetItemPosition(wxSizer* sizer, const wxGBPosition& pos);
bool SetItemPosition(size_t index, const wxGBPosition& pos); bool SetItemPosition(size_t index, const wxGBPosition& pos);
//@} //@}
//@{ //@{
@@ -214,8 +214,8 @@ public:
then @false is returned. then @false is returned.
*/ */
bool SetItemSpan(wxWindow* window, const wxGBSpan& span); bool SetItemSpan(wxWindow* window, const wxGBSpan& span);
bool SetItemSpan(wxSizer* sizer, const wxGBSpan& span); bool SetItemSpan(wxSizer* sizer, const wxGBSpan& span);
bool SetItemSpan(size_t index, const wxGBSpan& span); bool SetItemSpan(size_t index, const wxGBSpan& span);
//@} //@}
}; };
@@ -246,14 +246,14 @@ public:
wxGBSizerItem(int width, int height, const wxGBPosition& pos, wxGBSizerItem(int width, int height, const wxGBPosition& pos,
const wxGBSpan& span, int flag, const wxGBSpan& span, int flag,
int border, wxObject* userData); int border, wxObject* userData);
wxGBSizerItem(wxWindow* window, const wxGBPosition& pos, wxGBSizerItem(wxWindow* window, const wxGBPosition& pos,
const wxGBSpan& span, const wxGBSpan& span,
int flag, int border, int flag, int border,
wxObject* userData); wxObject* userData);
wxGBSizerItem(wxSizer* sizer, const wxGBPosition& pos, wxGBSizerItem(wxSizer* sizer, const wxGBPosition& pos,
const wxGBSpan& span, const wxGBSpan& span,
int flag, int border, int flag, int border,
wxObject* userData); wxObject* userData);
//@} //@}
/** /**
@@ -266,7 +266,7 @@ public:
Get the grid position of the item. Get the grid position of the item.
*/ */
wxGBPosition GetPos(); wxGBPosition GetPos();
void GetPos(int& row, int& col); void GetPos(int& row, int& col);
//@} //@}
//@{ //@{
@@ -274,7 +274,7 @@ public:
Get the row and column spanning of the item. Get the row and column spanning of the item.
*/ */
wxGBSpan GetSpan(); wxGBSpan GetSpan();
void GetSpan(int& rowspan, int& colspan); void GetSpan(int& rowspan, int& colspan);
//@} //@}
//@{ //@{
@@ -282,8 +282,8 @@ public:
Returns @true if the given pos/span would intersect with this item. Returns @true if the given pos/span would intersect with this item.
*/ */
bool Intersects(const wxGBSizerItem& other); bool Intersects(const wxGBSizerItem& other);
bool Intersects(const wxGBPosition& pos, bool Intersects(const wxGBPosition& pos,
const wxGBSpan& span); const wxGBSpan& span);
//@} //@}
/** /**
@@ -324,7 +324,7 @@ public:
each direction. each direction.
*/ */
wxGBSpan(); wxGBSpan();
wxGBSpan(int rowspan, int colspan); wxGBSpan(int rowspan, int colspan);
//@} //@}
/** /**

114
interface/gdicmn.h
View File

@@ -34,7 +34,7 @@ public:
Members of the @b wxRealPoint object. Members of the @b wxRealPoint object.
*/ */
wxRealPoint(); wxRealPoint();
wxRealPoint(double x, double y); wxRealPoint(double x, double y);
//@} //@}
}; };
@@ -59,10 +59,10 @@ public:
Creates a wxRect object from size values at the origin. Creates a wxRect object from size values at the origin.
*/ */
wxRect(); wxRect();
wxRect(int x, int y, int width, int height); wxRect(int x, int y, int width, int height);
wxRect(const wxPoint& topLeft, const wxPoint& bottomRight); wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
wxRect(const wxPoint& pos, const wxSize& size); wxRect(const wxPoint& pos, const wxSize& size);
wxRect(const wxSize& size); wxRect(const wxSize& size);
//@} //@}
//@{ //@{
@@ -74,7 +74,7 @@ public:
the other component of its position remains unchanged. the other component of its position remains unchanged.
*/ */
wxRect CentreIn(const wxRect& r, int dir = wxBOTH); wxRect CentreIn(const wxRect& r, int dir = wxBOTH);
wxRect CenterIn(const wxRect& r, int dir = wxBOTH); wxRect CenterIn(const wxRect& r, int dir = wxBOTH);
//@} //@}
//@{ //@{
@@ -83,8 +83,8 @@ public:
(or touches its boundary) and @false otherwise. (or touches its boundary) and @false otherwise.
*/ */
bool Contains(int x, int y); bool Contains(int x, int y);
bool Contains(const wxPoint& pt); bool Contains(const wxPoint& pt);
bool Contains(const wxRect& rect); bool Contains(const wxRect& rect);
//@} //@}
//@{ //@{
@@ -98,9 +98,9 @@ public:
@sa Inflate() @sa Inflate()
*/ */
void Deflate(wxCoord dx, wxCoord dy); void Deflate(wxCoord dx, wxCoord dy);
void Deflate(const wxSize& diff); void Deflate(const wxSize& diff);
void Deflate(wxCoord diff); void Deflate(wxCoord diff);
wxRect Deflate(wxCoord dx, wxCoord dy); wxRect Deflate(wxCoord dx, wxCoord dy);
//@} //@}
/** /**
@@ -213,9 +213,9 @@ public:
@sa Deflate() @sa Deflate()
*/ */
void Inflate(wxCoord dx, wxCoord dy); void Inflate(wxCoord dx, wxCoord dy);
void Inflate(const wxSize& diff); void Inflate(const wxSize& diff);
void Inflate(wxCoord diff); void Inflate(wxCoord diff);
wxRect Inflate(wxCoord dx, wxCoord dy); wxRect Inflate(wxCoord dx, wxCoord dy);
//@} //@}
//@{ //@{
@@ -225,7 +225,7 @@ public:
other one modifies this rectangle in place. other one modifies this rectangle in place.
*/ */
wxRect Intersect(const wxRect& rect); wxRect Intersect(const wxRect& rect);
wxRect Intersect(const wxRect& rect); wxRect Intersect(const wxRect& rect);
//@} //@}
/** /**
@@ -247,7 +247,7 @@ public:
bottom, otherwise it is moved to the left or top respectively. bottom, otherwise it is moved to the left or top respectively.
*/ */
void Offset(wxCoord dx, wxCoord dy); void Offset(wxCoord dx, wxCoord dy);
void Offset(const wxPoint& pt); void Offset(const wxPoint& pt);
//@} //@}
/** /**
@@ -284,7 +284,7 @@ public:
other one modifies this rectangle in place. other one modifies this rectangle in place.
*/ */
wxRect Union(const wxRect& rect); wxRect Union(const wxRect& rect);
wxRect Union(const wxRect& rect); wxRect Union(const wxRect& rect);
//@} //@}
/** /**
@@ -299,11 +299,11 @@ public:
Returns the intersection of two rectangles (which may be empty). Returns the intersection of two rectangles (which may be empty).
*/ */
bool operator !=(const wxRect& r1, const wxRect& r2); bool operator !=(const wxRect& r1, const wxRect& r2);
wxRect operator +(const wxRect& r1, const wxRect& r2); wxRect operator +(const wxRect& r1, const wxRect& r2);
wxRect operator +=(const wxRect& r); wxRect operator +=(const wxRect& r);
See also wxRect operator *(const wxRect& r1, See also wxRect operator *(const wxRect& r1,
const wxRect& r2); const wxRect& r2);
wxRect operator *=(const wxRect& r); wxRect operator *=(const wxRect& r);
//@} //@}
/** /**
@@ -398,7 +398,7 @@ public:
Create a point. Create a point.
*/ */
wxPoint(); wxPoint();
wxPoint(int x, int y); wxPoint(int x, int y);
//@} //@}
//@{ //@{
@@ -407,18 +407,18 @@ public:
wxSize object. wxSize object.
*/ */
void operator =(const wxPoint& pt); void operator =(const wxPoint& pt);
bool operator ==(const wxPoint& p1, const wxPoint& p2); bool operator ==(const wxPoint& p1, const wxPoint& p2);
bool operator !=(const wxPoint& p1, const wxPoint& p2); bool operator !=(const wxPoint& p1, const wxPoint& p2);
wxPoint operator +(const wxPoint& p1, const wxPoint& p2); wxPoint operator +(const wxPoint& p1, const wxPoint& p2);
wxPoint operator -(const wxPoint& p1, const wxPoint& p2); wxPoint operator -(const wxPoint& p1, const wxPoint& p2);
wxPoint operator +=(const wxPoint& pt); wxPoint operator +=(const wxPoint& pt);
wxPoint operator -=(const wxPoint& pt); wxPoint operator -=(const wxPoint& pt);
wxPoint operator +(const wxPoint& pt, const wxSize& sz); wxPoint operator +(const wxPoint& pt, const wxSize& sz);
wxPoint operator -(const wxPoint& pt, const wxSize& sz); wxPoint operator -(const wxPoint& pt, const wxSize& sz);
wxPoint operator +(const wxSize& sz, const wxPoint& pt); wxPoint operator +(const wxSize& sz, const wxPoint& pt);
wxPoint operator -(const wxSize& sz, const wxPoint& pt); wxPoint operator -(const wxSize& sz, const wxPoint& pt);
wxPoint operator +=(const wxSize& sz); wxPoint operator +=(const wxSize& sz);
wxPoint operator -=(const wxSize& sz); wxPoint operator -=(const wxSize& sz);
//@} //@}
/** /**
@@ -474,7 +474,7 @@ public:
*/ */
void AddColour(const wxString& colourName, void AddColour(const wxString& colourName,
const wxColour& colour); const wxColour& colour);
void AddColour(const wxString& colourName, wxColour* colour); void AddColour(const wxString& colourName, wxColour* colour);
//@} //@}
/** /**
@@ -564,7 +564,7 @@ public:
Creates a size object. Creates a size object.
*/ */
wxSize(); wxSize();
wxSize(int width, int height); wxSize(int width, int height);
//@} //@}
//@{ //@{
@@ -578,8 +578,8 @@ public:
@sa IncBy() @sa IncBy()
*/ */
void DecBy(const wxSize& size); void DecBy(const wxSize& size);
void DecBy(int dx, int dy); void DecBy(int dx, int dy);
void DecBy(int d); void DecBy(int d);
//@} //@}
/** /**
@@ -611,8 +611,8 @@ public:
@sa DecBy() @sa DecBy()
*/ */
void IncBy(const wxSize& size); void IncBy(const wxSize& size);
void IncBy(int dx, int dy); void IncBy(int dx, int dy);
void IncBy(int d); void IncBy(int d);
//@} //@}
/** /**
@@ -639,17 +639,17 @@ public:
integer. integer.
*/ */
void operator =(const wxSize& sz); void operator =(const wxSize& sz);
bool operator ==(const wxSize& s1, const wxSize& s2); bool operator ==(const wxSize& s1, const wxSize& s2);
bool operator !=(const wxSize& s1, const wxSize& s2); bool operator !=(const wxSize& s1, const wxSize& s2);
wxSize operator +(const wxSize& s1, const wxSize& s2); wxSize operator +(const wxSize& s1, const wxSize& s2);
wxSize operator -(const wxSize& s1, const wxSize& s2); wxSize operator -(const wxSize& s1, const wxSize& s2);
wxSize operator +=(const wxSize& sz); wxSize operator +=(const wxSize& sz);
wxSize operator -=(const wxSize& sz); wxSize operator -=(const wxSize& sz);
wxSize operator /(const wxSize& sz, int factor); wxSize operator /(const wxSize& sz, int factor);
wxSize operator *(const wxSize& sz, int factor); wxSize operator *(const wxSize& sz, int factor);
wxSize operator *(int factor, const wxSize& sz); wxSize operator *(int factor, const wxSize& sz);
wxSize operator /=(int factor); wxSize operator /=(int factor);
wxSize operator *=(int factor); wxSize operator *=(int factor);
//@} //@}
/** /**
@@ -754,8 +754,8 @@ public:
*/ */
wxPen* FindOrCreatePen(const wxColour& colour, int width, wxPen* FindOrCreatePen(const wxColour& colour, int width,
int style); int style);
wxPen* FindOrCreatePen(const wxString& colourName, int width, wxPen* FindOrCreatePen(const wxString& colourName, int width,
int style); int style);
//@} //@}
}; };
@@ -773,7 +773,7 @@ public:
*/ */
void wxClientDisplayRect(int * x, int * y, int * width, void wxClientDisplayRect(int * x, int * y, int * width,
int * height); int * height);
wxRect wxGetClientDisplayRect(); wxRect wxGetClientDisplayRect();
//@} //@}
//@{ //@{
@@ -781,7 +781,7 @@ void wxClientDisplayRect(int * x, int * y, int * width,
Returns the display size in pixels. Returns the display size in pixels.
*/ */
void wxDisplaySize(int * width, int * height); void wxDisplaySize(int * width, int * height);
wxSize wxGetDisplaySize(); wxSize wxGetDisplaySize();
//@} //@}
//@{ //@{
@@ -789,7 +789,7 @@ void wxDisplaySize(int * width, int * height);
Returns the display size in millimeters. Returns the display size in millimeters.
*/ */
void wxDisplaySizeMM(int * width, int * height); void wxDisplaySizeMM(int * width, int * height);
wxSize wxGetDisplaySizeMM(); wxSize wxGetDisplaySizeMM();
//@} //@}
/** /**

98
interface/graphics.h
View File

@@ -28,10 +28,10 @@ public:
void AddArc(wxDouble x, wxDouble y, wxDouble r, void AddArc(wxDouble x, wxDouble y, wxDouble r,
wxDouble startAngle, wxDouble startAngle,
wxDouble endAngle, bool clockwise); wxDouble endAngle, bool clockwise);
void AddArc(const wxPoint2DDouble& c, wxDouble r, void AddArc(const wxPoint2DDouble& c, wxDouble r,
wxDouble startAngle, wxDouble startAngle,
wxDouble endAngle, wxDouble endAngle,
bool clockwise); bool clockwise);
//@} //@}
/** /**
@@ -55,9 +55,9 @@ public:
wxDouble cy2, wxDouble cy2,
wxDouble x, wxDouble x,
wxDouble y); wxDouble y);
void AddCurveToPoint(const wxPoint2DDouble& c1, void AddCurveToPoint(const wxPoint2DDouble& c1,
const wxPoint2DDouble& c2, const wxPoint2DDouble& c2,
const wxPoint2DDouble& e); const wxPoint2DDouble& e);
//@} //@}
/** /**
@@ -70,7 +70,7 @@ public:
*/ */
void AddLineToPoint(wxDouble x, wxDouble y); void AddLineToPoint(wxDouble x, wxDouble y);
void AddLineToPoint(const wxPoint2DDouble& p); void AddLineToPoint(const wxPoint2DDouble& p);
//@} //@}
/** /**
@@ -108,8 +108,8 @@ public:
*/ */
bool Contains(const wxPoint2DDouble& c, bool Contains(const wxPoint2DDouble& c,
int fillStyle = wxODDEVEN_RULE); int fillStyle = wxODDEVEN_RULE);
bool Contains(wxDouble x, wxDouble y, bool Contains(wxDouble x, wxDouble y,
int fillStyle = wxODDEVEN_RULE); int fillStyle = wxODDEVEN_RULE);
//@} //@}
//@{ //@{
@@ -117,8 +117,8 @@ public:
Gets the bounding box enclosing all points (possibly including control points). Gets the bounding box enclosing all points (possibly including control points).
*/ */
wxRect2DDouble GetBox(); wxRect2DDouble GetBox();
void GetBox(wxDouble* x, wxDouble* y, wxDouble* w, void GetBox(wxDouble* x, wxDouble* y, wxDouble* w,
wxDouble* h); wxDouble* h);
//@} //@}
//@{ //@{
@@ -126,7 +126,7 @@ public:
Gets the last point of the current path, (0,0) if not yet set. Gets the last point of the current path, (0,0) if not yet set.
*/ */
void GetCurrentPoint(wxDouble* x, wxDouble* y); void GetCurrentPoint(wxDouble* x, wxDouble* y);
wxPoint2DDouble GetCurrentPoint(); wxPoint2DDouble GetCurrentPoint();
//@} //@}
/** /**
@@ -140,7 +140,7 @@ public:
Begins a new subpath at (x,y) Begins a new subpath at (x,y)
*/ */
void MoveToPoint(wxDouble x, wxDouble y); void MoveToPoint(wxDouble x, wxDouble y);
void MoveToPoint(const wxPoint2DDouble& p); void MoveToPoint(const wxPoint2DDouble& p);
//@} //@}
/** /**
@@ -209,7 +209,7 @@ public:
Clips drawings to the rectangle. Clips drawings to the rectangle.
*/ */
void Clip(const wxRegion& region); void Clip(const wxRegion& region);
void Clip(wxDouble x, wxDouble y, wxDouble w, wxDouble h); void Clip(wxDouble x, wxDouble y, wxDouble w, wxDouble h);
//@} //@}
/** /**
@@ -224,7 +224,7 @@ public:
@sa wxGraphicsRenderer:: CreateContext @sa wxGraphicsRenderer:: CreateContext
*/ */
wxGraphicsContext* Create(const wxWindowDC& dc); wxGraphicsContext* Create(const wxWindowDC& dc);
wxGraphicsContext* Create(wxWindow* window); wxGraphicsContext* Create(wxWindow* window);
//@} //@}
/** /**
@@ -259,11 +259,11 @@ public:
color c1 to (x2,y2) with color c2 color c1 to (x2,y2) with color c2
*/ */
wxGraphicsBrush CreateLinearGradientBrush(wxDouble x1, wxGraphicsBrush CreateLinearGradientBrush(wxDouble x1,
wxDouble y1, wxDouble y1,
wxDouble x2, wxDouble x2,
wxDouble y2, wxDouble y2,
const wxColouramp;c1, const wxColouramp;c1,
const wxColouramp;c2); const wxColouramp;c2);
/** /**
Creates a native affine transformation matrix from the passed in values. The Creates a native affine transformation matrix from the passed in values. The
@@ -290,12 +290,12 @@ public:
color oColour and ends on a circle around (xc,yc) with radius r and color cColour color oColour and ends on a circle around (xc,yc) with radius r and color cColour
*/ */
wxGraphicsBrush CreateRadialGradientBrush(wxDouble xo, wxGraphicsBrush CreateRadialGradientBrush(wxDouble xo,
wxDouble yo, wxDouble yo,
wxDouble xc, wxDouble xc,
wxDouble yc, wxDouble yc,
wxDouble radius, wxDouble radius,
const wxColour& oColor, const wxColour& oColor,
const wxColour& cColor); const wxColour& cColor);
/** /**
Draws the bitmap. In case of a mono bitmap, this is treated as a mask and the Draws the bitmap. In case of a mono bitmap, this is treated as a mask and the
@@ -346,7 +346,7 @@ public:
*/ */
void DrawText(const wxString& str, wxDouble x, wxDouble y, void DrawText(const wxString& str, wxDouble x, wxDouble y,
wxDouble angle); wxDouble angle);
void DrawText(const wxString& str, wxDouble x, wxDouble y); void DrawText(const wxString& str, wxDouble x, wxDouble y);
//@} //@}
/** /**
@@ -406,7 +406,7 @@ public:
Sets the brush for filling paths. Sets the brush for filling paths.
*/ */
void SetBrush(const wxBrush& brush); void SetBrush(const wxBrush& brush);
void SetBrush(const wxGraphicsBrush& brush); void SetBrush(const wxGraphicsBrush& brush);
//@} //@}
//@{ //@{
@@ -414,7 +414,7 @@ public:
Sets the font for drawing text. Sets the font for drawing text.
*/ */
void SetFont(const wxFont& font, const wxColour& colour); void SetFont(const wxFont& font, const wxColour& colour);
void SetFont(const wxGraphicsFont& font); void SetFont(const wxGraphicsFont& font);
//@} //@}
//@{ //@{
@@ -422,7 +422,7 @@ public:
Sets the pen used for stroking. Sets the pen used for stroking.
*/ */
void SetPen(const wxGraphicsPen& pen); void SetPen(const wxGraphicsPen& pen);
void SetPen(const wxPen& pen); void SetPen(const wxPen& pen);
//@} //@}
/** /**
@@ -443,7 +443,7 @@ public:
*/ */
void StrokeLines(size_t n, const wxPoint2DDouble* beginPoints, void StrokeLines(size_t n, const wxPoint2DDouble* beginPoints,
const wxPoint2DDouble* endPoints); const wxPoint2DDouble* endPoints);
void StrokeLines(size_t n, const wxPoint2DDouble* points); void StrokeLines(size_t n, const wxPoint2DDouble* points);
//@} //@}
/** /**
@@ -481,7 +481,7 @@ public:
Creates a wxGraphicsContext from a wxWindow. Creates a wxGraphicsContext from a wxWindow.
*/ */
wxGraphicsContext * CreateContext(const wxWindowDC& dc); wxGraphicsContext * CreateContext(const wxWindowDC& dc);
wxGraphicsContext * CreateContext(wxWindow* window); wxGraphicsContext * CreateContext(wxWindow* window);
//@} //@}
/** /**
@@ -506,11 +506,11 @@ public:
color c1 to (x2,y2) with color c2 color c1 to (x2,y2) with color c2
*/ */
wxGraphicsBrush CreateLinearGradientBrush(wxDouble x1, wxGraphicsBrush CreateLinearGradientBrush(wxDouble x1,
wxDouble y1, wxDouble y1,
wxDouble x2, wxDouble x2,
wxDouble y2, wxDouble y2,
const wxColouramp;c1, const wxColouramp;c1,
const wxColouramp;c2); const wxColouramp;c2);
/** /**
Creates a native affine transformation matrix from the passed in values. The Creates a native affine transformation matrix from the passed in values. The
@@ -537,12 +537,12 @@ public:
color oColour and ends on a circle around (xc,yc) with radius r and color cColour color oColour and ends on a circle around (xc,yc) with radius r and color cColour
*/ */
wxGraphicsBrush CreateRadialGradientBrush(wxDouble xo, wxGraphicsBrush CreateRadialGradientBrush(wxDouble xo,
wxDouble yo, wxDouble yo,
wxDouble xc, wxDouble xc,
wxDouble yc, wxDouble yc,
wxDouble radius, wxDouble radius,
const wxColour& oColour, const wxColour& oColour,
const wxColour& cColour); const wxColour& cColour);
/** /**
Returns the default renderer on this platform. On OS X this is the Core Returns the default renderer on this platform. On OS X this is the Core
@@ -615,15 +615,15 @@ public:
*/ */
void Concat(const wxGraphicsMatrix* t); void Concat(const wxGraphicsMatrix* t);
void Concat(const wxGraphicsMatrix& t); void Concat(const wxGraphicsMatrix& t);
//@} //@}
/** /**
Returns the component values of the matrix via the argument pointers. Returns the component values of the matrix via the argument pointers.
*/ */
#define void Get(wxDouble* a=@NULL, wxDouble* b=@NULL, wxDouble* c=@NULL, #define void Get(wxDouble* a=@NULL, wxDouble* b=@NULL, wxDouble* c=@NULL,
wxDouble* d=@NULL, wxDouble* tx=@NULL, wxDouble* d=@NULL, wxDouble* tx=@NULL,
wxDouble* ty=@NULL) /* implementation is private */ wxDouble* ty=@NULL) /* implementation is private */
/** /**
Returns the native representation of the matrix. For CoreGraphics this is a Returns the native representation of the matrix. For CoreGraphics this is a
@@ -661,8 +661,8 @@ public:
matrix) matrix)
*/ */
#define void Set(wxDouble a = 1.0, wxDouble b = 0.0, wxDouble c = 0.0, #define void Set(wxDouble a = 1.0, wxDouble b = 0.0, wxDouble c = 0.0,
wxDouble d = 1.0, wxDouble tx = 0.0, wxDouble d = 1.0, wxDouble tx = 0.0,
wxDouble ty = 0.0) /* implementation is private */ wxDouble ty = 0.0) /* implementation is private */
/** /**
Applies this matrix to a distance (ie. performs all transforms except Applies this matrix to a distance (ie. performs all transforms except

114
interface/grid.h
View File

@@ -467,8 +467,8 @@ public:
wxGridCellChoiceEditor(size_t count = 0, wxGridCellChoiceEditor(size_t count = 0,
const wxString choices[] = @NULL, const wxString choices[] = @NULL,
bool allowOthers = @false); bool allowOthers = @false);
wxGridCellChoiceEditor(const wxArrayString& choices, wxGridCellChoiceEditor(const wxArrayString& choices,
bool allowOthers = @false); bool allowOthers = @false);
//@} //@}
/** /**
@@ -494,11 +494,11 @@ public:
*/ */
wxGridEditorCreatedEvent(); wxGridEditorCreatedEvent();
wxGridEditorCreatedEvent(int id, wxEventType type, wxGridEditorCreatedEvent(int id, wxEventType type,
wxObject* obj, wxObject* obj,
int row, int row,
int col, int col,
wxControl* ctrl); wxControl* ctrl);
//@} //@}
/** /**
@@ -549,15 +549,15 @@ public:
*/ */
wxGridRangeSelectEvent(); wxGridRangeSelectEvent();
wxGridRangeSelectEvent(int id, wxEventType type, wxGridRangeSelectEvent(int id, wxEventType type,
wxObject* obj, wxObject* obj,
const wxGridCellCoords& topLeft, const wxGridCellCoords& topLeft,
const wxGridCellCoords& bottomRight, const wxGridCellCoords& bottomRight,
bool sel = @true, bool sel = @true,
bool control = @false, bool control = @false,
bool shift = @false, bool shift = @false,
bool alt = @false, bool alt = @false,
bool meta = @false); bool meta = @false);
//@} //@}
/** /**
@@ -721,14 +721,14 @@ public:
*/ */
wxGridSizeEvent(); wxGridSizeEvent();
wxGridSizeEvent(int id, wxEventType type, wxObject* obj, wxGridSizeEvent(int id, wxEventType type, wxObject* obj,
int rowOrCol = -1, int rowOrCol = -1,
int x = -1, int x = -1,
int y = -1, int y = -1,
bool control = @false, bool control = @false,
bool shift = @false, bool shift = @false,
bool alt = @false, bool alt = @false,
bool meta = @false); bool meta = @false);
//@} //@}
/** /**
@@ -805,10 +805,10 @@ public:
Constructor specifying some of the often used attributes. Constructor specifying some of the often used attributes.
*/ */
wxGridCellAttr(); wxGridCellAttr();
wxGridCellAttr(const wxColour& colText, wxGridCellAttr(const wxColour& colText,
const wxColour& colBack, const wxColour& colBack,
const wxFont& font, const wxFont& font,
int hAlign, int vAlign); int hAlign, int vAlign);
//@} //@}
/** /**
@@ -978,14 +978,14 @@ public:
*/ */
wxGridEvent(); wxGridEvent();
wxGridEvent(int id, wxEventType type, wxObject* obj, wxGridEvent(int id, wxEventType type, wxObject* obj,
int row = -1, int col = -1, int row = -1, int col = -1,
int x = -1, int y = -1, int x = -1, int y = -1,
bool sel = @true, bool sel = @true,
bool control = @false, bool control = @false,
bool shift = @false, bool shift = @false,
bool alt = @false, bool alt = @false,
bool meta = @false); bool meta = @false);
//@} //@}
/** /**
@@ -1126,11 +1126,11 @@ public:
it. it.
*/ */
wxGrid(); wxGrid();
wxGrid(wxWindow* parent, wxWindowID id, wxGrid(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxWANTS_CHARS, long style = wxWANTS_CHARS,
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
//@} //@}
/** /**
@@ -1332,7 +1332,7 @@ public:
coordinates. coordinates.
*/ */
wxRect CellToRect(int row, int col); wxRect CellToRect(int row, int col);
wxRect CellToRect(const wxGridCellCoords& coords); wxRect CellToRect(const wxGridCellCoords& coords);
//@} //@}
/** /**
@@ -1596,7 +1596,7 @@ public:
and the @ref overview_gridoverview "wxGrid overview" for more information. and the @ref overview_gridoverview "wxGrid overview" for more information.
*/ */
wxString GetCellValue(int row, int col); wxString GetCellValue(int row, int col);
wxString GetCellValue(const wxGridCellCoords& coords); wxString GetCellValue(const wxGridCellCoords& coords);
//@} //@}
/** /**
@@ -1720,7 +1720,7 @@ public:
*/ */
wxGridCellEditor* GetDefaultEditorForCell(int row, int col); wxGridCellEditor* GetDefaultEditorForCell(int row, int col);
wxGridCellEditor* GetDefaultEditorForCell(const wxGridCellCoords& c); wxGridCellEditor* GetDefaultEditorForCell(const wxGridCellCoords& c);
//@} //@}
/** /**
@@ -2048,7 +2048,7 @@ public:
Is this cell currently selected. Is this cell currently selected.
*/ */
bool IsInSelection(int row, int col); bool IsInSelection(int row, int col);
bool IsInSelection(const wxGridCellCoords& coords); bool IsInSelection(const wxGridCellCoords& coords);
//@} //@}
/** /**
@@ -2069,8 +2069,8 @@ public:
visible in the grid window. visible in the grid window.
*/ */
bool IsVisible(int row, int col, bool wholeCellVisible = @true); bool IsVisible(int row, int col, bool wholeCellVisible = @true);
bool IsVisible(const wxGridCellCoords& coords, bool IsVisible(const wxGridCellCoords& coords,
bool wholeCellVisible = @true); bool wholeCellVisible = @true);
//@} //@}
//@{ //@{
@@ -2080,7 +2080,7 @@ public:
nothing if the cell is already visible. nothing if the cell is already visible.
*/ */
void MakeCellVisible(int row, int col); void MakeCellVisible(int row, int col);
void MakeCellVisible(const wxGridCellCoords& coords); void MakeCellVisible(const wxGridCellCoords& coords);
//@} //@}
/** /**
@@ -2249,9 +2249,9 @@ public:
void SelectBlock(int topRow, int leftCol, int bottomRow, void SelectBlock(int topRow, int leftCol, int bottomRow,
int rightCol, int rightCol,
bool addToSelected = @false); bool addToSelected = @false);
void SelectBlock(const wxGridCellCoords& topLeft, void SelectBlock(const wxGridCellCoords& topLeft,
const wxGridCellCoords& bottomRight, const wxGridCellCoords& bottomRight,
bool addToSelected = @false); bool addToSelected = @false);
//@} //@}
/** /**
@@ -2301,7 +2301,7 @@ public:
wxALIGN_BOTTOM. wxALIGN_BOTTOM.
*/ */
void SetCellAlignment(int row, int col, int horiz, int vert); void SetCellAlignment(int row, int col, int horiz, int vert);
void SetCellAlignment(int align, int row, int col); void SetCellAlignment(int align, int row, int col);
//@} //@}
/** /**
@@ -2341,8 +2341,8 @@ public:
Sets the text colour for the grid cell at the specified location. Sets the text colour for the grid cell at the specified location.
*/ */
void SetCellTextColour(int row, int col, const wxColour& colour); void SetCellTextColour(int row, int col, const wxColour& colour);
void SetCellTextColour(const wxColour& val, int row, int col); void SetCellTextColour(const wxColour& val, int row, int col);
void SetCellTextColour(const wxColour& colour); void SetCellTextColour(const wxColour& colour);
//@} //@}
//@{ //@{
@@ -2365,9 +2365,9 @@ public:
and the @ref overview_gridoverview "wxGrid overview" for more information. and the @ref overview_gridoverview "wxGrid overview" for more information.
*/ */
void SetCellValue(int row, int col, const wxString& s); void SetCellValue(int row, int col, const wxString& s);
void SetCellValue(const wxGridCellCoords& coords, void SetCellValue(const wxGridCellCoords& coords,
const wxString& s); const wxString& s);
void SetCellValue(const wxString& val, int row, int col); void SetCellValue(const wxString& val, int row, int col);
//@} //@}
/** /**

6
interface/hash.h
View File

@@ -54,7 +54,7 @@ public:
Deletes entry in hash table and returns the user's data (if found). Deletes entry in hash table and returns the user's data (if found).
*/ */
wxObject * Delete(long key); wxObject * Delete(long key);
wxObject * Delete(const wxString& key); wxObject * Delete(const wxString& key);
//@} //@}
/** /**
@@ -70,7 +70,7 @@ public:
has table constructor was used). has table constructor was used).
*/ */
wxObject * Get(long key); wxObject * Get(long key);
wxObject * Get(const char* key); wxObject * Get(const char* key);
//@} //@}
/** /**
@@ -102,6 +102,6 @@ public:
table implementation. table implementation.
*/ */
void Put(long key, wxObject * object); void Put(long key, wxObject * object);
void Put(const char* key, wxObject * object); void Put(const char* key, wxObject * object);
//@} //@}
}; };

12
interface/hashmap.h
View File

@@ -26,7 +26,7 @@ public:
Copy constructor. Copy constructor.
*/ */
wxHashMap(size_type size = 10); wxHashMap(size_type size = 10);
wxHashMap(const wxHashMap& map); wxHashMap(const wxHashMap& map);
//@} //@}
//@{ //@{
@@ -35,7 +35,7 @@ public:
Please remember that hash maps do not guarantee ordering. Please remember that hash maps do not guarantee ordering.
*/ */
const_iterator begin(); const_iterator begin();
iterator begin(); iterator begin();
//@} //@}
/** /**
@@ -60,7 +60,7 @@ public:
Please remember that hash maps do not guarantee ordering. Please remember that hash maps do not guarantee ordering.
*/ */
const_iterator end(); const_iterator end();
iterator end(); iterator end();
//@} //@}
//@{ //@{
@@ -69,8 +69,8 @@ public:
the iterator is no longer valid and must not be used. the iterator is no longer valid and must not be used.
*/ */
size_type erase(const key_type& key); size_type erase(const key_type& key);
void erase(iterator it); void erase(iterator it);
void erase(const_iterator it); void erase(const_iterator it);
//@} //@}
//@{ //@{
@@ -80,7 +80,7 @@ public:
is returned (i.e. hashmap.find( non_existent_key ) == hashmap.end()). is returned (i.e. hashmap.find( non_existent_key ) == hashmap.end()).
*/ */
iterator find(const key_type& key); iterator find(const key_type& key);
const_iterator find(const key_type& key); const_iterator find(const key_type& key);
//@} //@}
/** /**

12
interface/hashset.h
View File

@@ -26,7 +26,7 @@ public:
Copy constructor. Copy constructor.
*/ */
wxHashSet(size_type size = 10); wxHashSet(size_type size = 10);
wxHashSet(const wxHashSet& set); wxHashSet(const wxHashSet& set);
//@} //@}
//@{ //@{
@@ -35,7 +35,7 @@ public:
Please remember that hash sets do not guarantee ordering. Please remember that hash sets do not guarantee ordering.
*/ */
const_iterator begin(); const_iterator begin();
iterator begin(); iterator begin();
//@} //@}
/** /**
@@ -60,7 +60,7 @@ public:
Please remember that hash sets do not guarantee ordering. Please remember that hash sets do not guarantee ordering.
*/ */
const_iterator end(); const_iterator end();
iterator end(); iterator end();
//@} //@}
//@{ //@{
@@ -69,8 +69,8 @@ public:
the iterator is no longer valid and must not be used. the iterator is no longer valid and must not be used.
*/ */
size_type erase(const key_type& key); size_type erase(const key_type& key);
void erase(iterator it); void erase(iterator it);
void erase(const_iterator it); void erase(const_iterator it);
//@} //@}
//@{ //@{
@@ -80,7 +80,7 @@ public:
is returned (i.e. hashset.find( non_existent_key ) == hashset.end()). is returned (i.e. hashset.find( non_existent_key ) == hashset.end()).
*/ */
iterator find(const key_type& key); iterator find(const key_type& key);
const_iterator find(const key_type& key); const_iterator find(const key_type& key);
//@} //@}
/** /**

4
interface/help.h
View File

@@ -141,7 +141,7 @@ public:
various help file formats. various help file formats.
*/ */
virtual bool DisplaySection(const wxString& section); virtual bool DisplaySection(const wxString& section);
virtual bool DisplaySection(int sectionNo); virtual bool DisplaySection(int sectionNo);
//@} //@}
/** /**
@@ -191,7 +191,7 @@ public:
a suitable file. For WinHelp, the hlp extension is appended. a suitable file. For WinHelp, the hlp extension is appended.
*/ */
virtual bool Initialize(const wxString& file); virtual bool Initialize(const wxString& file);
virtual bool Initialize(const wxString& file, int server); virtual bool Initialize(const wxString& file, int server);
//@} //@}
/** /**

4
interface/html/helpctrl.h
View File

@@ -73,7 +73,7 @@ public:
different on most platforms) different on most platforms)
*/ */
bool AddBook(const wxFileName& bookFile, bool showWaitMsg); bool AddBook(const wxFileName& bookFile, bool showWaitMsg);
bool AddBook(const wxString& bookUrl, bool showWaitMsg); bool AddBook(const wxString& bookUrl, bool showWaitMsg);
//@} //@}
/** /**
@@ -94,7 +94,7 @@ public:
This alternative form is used to search help contents by numeric IDs. This alternative form is used to search help contents by numeric IDs.
*/ */
void Display(const wxString& x); void Display(const wxString& x);
void Display(const int id); void Display(const int id);
//@} //@}
/** /**

8
interface/html/helpdlg.h
View File

@@ -27,10 +27,10 @@ public:
wxHtmlHelpController. wxHtmlHelpController.
*/ */
wxHtmlHelpDialog(wxHtmlHelpData* data = @NULL); wxHtmlHelpDialog(wxHtmlHelpData* data = @NULL);
wxHtmlHelpDialog(wxWindow* parent, int wxWindowID, wxHtmlHelpDialog(wxWindow* parent, int wxWindowID,
const wxString& title = wxEmptyString, const wxString& title = wxEmptyString,
int style = wxHF_DEFAULT_STYLE, int style = wxHF_DEFAULT_STYLE,
wxHtmlHelpData* data = @NULL); wxHtmlHelpData* data = @NULL);
//@} //@}
/** /**

8
interface/html/helpfrm.h
View File

@@ -27,10 +27,10 @@ public:
wxHtmlHelpController. wxHtmlHelpController.
*/ */
wxHtmlHelpFrame(wxHtmlHelpData* data = @NULL); wxHtmlHelpFrame(wxHtmlHelpData* data = @NULL);
wxHtmlHelpFrame(wxWindow* parent, int wxWindowID, wxHtmlHelpFrame(wxWindow* parent, int wxWindowID,
const wxString& title = wxEmptyString, const wxString& title = wxEmptyString,
int style = wxHF_DEFAULT_STYLE, int style = wxHF_DEFAULT_STYLE,
wxHtmlHelpData* data = @NULL); wxHtmlHelpData* data = @NULL);
//@} //@}
/** /**

14
interface/html/helpwnd.h
View File

@@ -49,12 +49,12 @@ public:
wxHtmlHelpController. wxHtmlHelpController.
*/ */
wxHtmlHelpWindow(wxHtmlHelpData* data = @NULL); wxHtmlHelpWindow(wxHtmlHelpData* data = @NULL);
wxHtmlHelpWindow(wxWindow* parent, int wxWindowID, wxHtmlHelpWindow(wxWindow* parent, int wxWindowID,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& pos = wxDefaultSize, const wxSize& pos = wxDefaultSize,
int style = wxTAB_TRAVERSAL|wxBORDER_NONE, int style = wxTAB_TRAVERSAL|wxBORDER_NONE,
int helpStyle = wxHF_DEFAULT_STYLE, int helpStyle = wxHF_DEFAULT_STYLE,
wxHtmlHelpData* data = @NULL); wxHtmlHelpData* data = @NULL);
//@} //@}
/** /**
@@ -113,7 +113,7 @@ public:
(uses extension to MS format, param name="ID" value=id) (uses extension to MS format, param name="ID" value=id)
*/ */
bool Display(const wxString& x); bool Display(const wxString& x);
bool Display(const int id); bool Display(const int id);
//@} //@}
/** /**

8
interface/html/htmlcell.h
View File

@@ -569,8 +569,8 @@ public:
info is extracted from tag's WIDTH parameter. info is extracted from tag's WIDTH parameter.
*/ */
void SetWidthFloat(int w, int units); void SetWidthFloat(int w, int units);
void SetWidthFloat(const wxHtmlTag& tag, void SetWidthFloat(const wxHtmlTag& tag,
double pixel_scale = 1.0); double pixel_scale = 1.0);
//@} //@}
}; };
@@ -596,8 +596,8 @@ public:
frame). frame).
*/ */
wxHtmlLinkInfo(); wxHtmlLinkInfo();
wxHtmlLinkInfo(const wxString& href, wxHtmlLinkInfo(const wxString& href,
const wxString& target = wxEmptyString); const wxString& target = wxEmptyString);
//@} //@}
/** /**

2
interface/html/htmlpars.h
View File

@@ -142,7 +142,7 @@ public:
(in noparams version it parses whole m_Source) (in noparams version it parses whole m_Source)
*/ */
void DoParsing(int begin_pos, int end_pos); void DoParsing(int begin_pos, int end_pos);
void DoParsing(); void DoParsing();
//@} //@}
/** /**

14
interface/html/htmlwin.h
View File

@@ -51,11 +51,11 @@ public:
Window style. See wxHtmlWindow. Window style. See wxHtmlWindow.
*/ */
wxHtmlWindow(); wxHtmlWindow();
wxHtmlWindow(wxWindow parent, wxWindowID id = -1, wxHtmlWindow(wxWindow parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxHW_DEFAULT_STYLE, long style = wxHW_DEFAULT_STYLE,
const wxString& name = "htmlWindow"); const wxString& name = "htmlWindow");
//@} //@}
/** /**
@@ -250,8 +250,8 @@ public:
URL if OnOpeningURL returns wxHTML_REDIRECT. URL if OnOpeningURL returns wxHTML_REDIRECT.
*/ */
virtual wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type, virtual wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,
const wxString& url, const wxString& url,
wxString * redirect); wxString * redirect);
/** /**
Called on parsing @c TITLE tag. Called on parsing @c TITLE tag.

2
interface/html/winpars.h
View File

@@ -86,7 +86,7 @@ public:
window such as wxHtmlListBox). window such as wxHtmlListBox).
*/ */
wxHtmlWinParser(); wxHtmlWinParser();
wxHtmlWinParser(wxHtmlWindowInterface wndIface); wxHtmlWinParser(wxHtmlWindowInterface wndIface);
//@} //@}
/** /**

38
interface/htmllbox.h
View File

@@ -36,7 +36,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxHtmlListBoxNameStr); const wxString& name = wxHtmlListBoxNameStr);
wxHtmlListBox(); wxHtmlListBox();
//@} //@}
/** /**
@@ -69,7 +69,7 @@ public:
relative paths for the images or other resources embedded in your HTML. relative paths for the images or other resources embedded in your HTML.
*/ */
wxFileSystem GetFileSystem(); wxFileSystem GetFileSystem();
const wxFileSystem GetFileSystem(); const wxFileSystem GetFileSystem();
//@} //@}
/** /**
@@ -203,17 +203,17 @@ public:
long style = wxHLB_DEFAULT_STYLE, long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "simpleHtmlListBox"); const wxString& name = "simpleHtmlListBox");
wxHtmlListBox(wxWindow* parent, wxWindowID id, wxHtmlListBox(wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = wxHLB_DEFAULT_STYLE, long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "simpleHtmlListBox"); const wxString& name = "simpleHtmlListBox");
See also See also
wxSimpleHtmlListBox::Create wxSimpleHtmlListBox::Create
wxSimpleHtmlListBox(); wxSimpleHtmlListBox();
//@} //@}
/** /**
@@ -234,12 +234,12 @@ wxSimpleHtmlListBox::Create
long style = wxHLB_DEFAULT_STYLE, long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "simpleHtmlListBox"); const wxString& name = "simpleHtmlListBox");
bool Create(wxWindow* parent, wxWindowID id, bool Create(wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = wxHLB_DEFAULT_STYLE, long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "simpleHtmlListBox"); const wxString& name = "simpleHtmlListBox");
//@} //@}
}; };

14
interface/hyperlink.h
View File

@@ -183,11 +183,11 @@ public:
/** /**
Constructor. See Create() for more info. Constructor. See Create() for more info.
*/ */
wxHyperLink(wxWindow* parent, wxWindowID id, wxHyperLink(wxWindow* parent, wxWindowID id,
const wxString & label, const wxString & label,
const wxString & url, const wxString & url,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style, long style,
const wxString& name = "hyperlink"); const wxString& name = "hyperlink");
}; };

22
interface/icon.h
View File

@@ -114,17 +114,17 @@ public:
or LoadFile must be called subsequently. or LoadFile must be called subsequently.
*/ */
wxIcon(); wxIcon();
wxIcon(const wxIcon& icon); wxIcon(const wxIcon& icon);
wxIcon(void* data, int type, int width, int height, wxIcon(void* data, int type, int width, int height,
int depth = -1); int depth = -1);
wxIcon(const char bits[], int width, int height, wxIcon(const char bits[], int width, int height,
int depth = 1); int depth = 1);
wxIcon(int width, int height, int depth = -1); wxIcon(int width, int height, int depth = -1);
wxIcon(const char* const* bits); wxIcon(const char* const* bits);
wxIcon(const wxString& name, wxBitmapType type, wxIcon(const wxString& name, wxBitmapType type,
int desiredWidth = -1, int desiredWidth = -1,
int desiredHeight = -1); int desiredHeight = -1);
wxIcon(const wxIconLocation& loc); wxIcon(const wxIconLocation& loc);
//@} //@}
/** /**

10
interface/iconbndl.h
View File

@@ -28,9 +28,9 @@ public:
Copy constructor. Copy constructor.
*/ */
wxIconBundle(); wxIconBundle();
wxIconBundle(const wxString& file, long type); wxIconBundle(const wxString& file, long type);
wxIconBundle(const wxIcon& icon); wxIconBundle(const wxIcon& icon);
wxIconBundle(const wxIconBundle& ic); wxIconBundle(const wxIconBundle& ic);
//@} //@}
/** /**
@@ -45,7 +45,7 @@ public:
replaced by the new one. replaced by the new one.
*/ */
void AddIcon(const wxString& file, long type); void AddIcon(const wxString& file, long type);
void AddIcon(const wxIcon& icon); void AddIcon(const wxIcon& icon);
//@} //@}
//@{ //@{
@@ -53,7 +53,7 @@ public:
Same as GetIcon( wxSize( size, size ) ). Same as GetIcon( wxSize( size, size ) ).
*/ */
wxIcon GetIcon(const wxSize& size); wxIcon GetIcon(const wxSize& size);
wxIcon GetIcon(wxCoord size = -1); wxIcon GetIcon(wxCoord size = -1);
//@} //@}
/** /**

82
interface/image.h
View File

@@ -275,20 +275,20 @@ public:
@sa LoadFile() @sa LoadFile()
*/ */
wxImage(); wxImage();
wxImage(const wxImage& image); wxImage(const wxImage& image);
wxImage(const wxBitmap& bitmap); wxImage(const wxBitmap& bitmap);
wxImage(int width, int height, bool clear=@true); wxImage(int width, int height, bool clear=@true);
wxImage(int width, int height, unsigned char* data, wxImage(int width, int height, unsigned char* data,
bool static_data = @false); bool static_data = @false);
wxImage(const wxString& name, long type = wxBITMAP_TYPE_ANY, wxImage(const wxString& name, long type = wxBITMAP_TYPE_ANY,
int index = -1); int index = -1);
wxImage(const wxString& name, const wxString& mimetype, wxImage(const wxString& name, const wxString& mimetype,
int index = -1); int index = -1);
wxImage(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, wxImage(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY,
int index = -1); int index = -1);
wxImage(wxInputStream& stream, const wxString& mimetype, wxImage(wxInputStream& stream, const wxString& mimetype,
int index = -1); int index = -1);
wxImage(const char* const* xpmData); wxImage(const char* const* xpmData);
//@} //@}
/** /**
@@ -303,7 +303,7 @@ public:
returns @true if the current image handlers can read this file returns @true if the current image handlers can read this file
*/ */
static void AddHandler(wxImageHandler* handler); static void AddHandler(wxImageHandler* handler);
See also bool CanRead(const wxString& filename); See also bool CanRead(const wxString& filename);
//@} //@}
/** /**
@@ -446,10 +446,10 @@ public:
@sa wxImageHandler @sa wxImageHandler
*/ */
static wxImageHandler* FindHandler(const wxString& name); static wxImageHandler* FindHandler(const wxString& name);
static wxImageHandler* FindHandler(const wxString& extension, static wxImageHandler* FindHandler(const wxString& extension,
long imageType); long imageType);
static wxImageHandler* FindHandler(long imageType); static wxImageHandler* FindHandler(long imageType);
static wxImageHandler* FindHandlerMime(const wxString& mimetype); static wxImageHandler* FindHandlerMime(const wxString& mimetype);
//@} //@}
//@{ //@{
@@ -460,7 +460,7 @@ public:
which are stored as the @ref getdata() RGB ones. which are stored as the @ref getdata() RGB ones.
*/ */
unsigned char GetAlpha(int x, int y); unsigned char GetAlpha(int x, int y);
unsigned char * GetAlpha(); unsigned char * GetAlpha();
//@} //@}
/** /**
@@ -579,8 +579,8 @@ public:
*/ */
static int GetImageCount(const wxString& filename, static int GetImageCount(const wxString& filename,
long type = wxBITMAP_TYPE_ANY); long type = wxBITMAP_TYPE_ANY);
static int GetImageCount(wxInputStream& stream, static int GetImageCount(wxInputStream& stream,
long type = wxBITMAP_TYPE_ANY); long type = wxBITMAP_TYPE_ANY);
//@} //@}
/** /**
@@ -704,7 +704,7 @@ public:
and RGBtoHSV(), which and RGBtoHSV(), which
converts between HSV color space and RGB color space. converts between HSV color space and RGB color space.
*/ */
HSVValue(double h = 0.0, double s = 0.0, double v = 0.0); HSVValue(double h = 0.0, double s = 0.0, double v = 0.0);
/** /**
Converts a color in HSV color space to RGB color space. Converts a color in HSV color space to RGB color space.
@@ -870,13 +870,13 @@ public:
bool LoadFile(const wxString& name, bool LoadFile(const wxString& name,
long type = wxBITMAP_TYPE_ANY, long type = wxBITMAP_TYPE_ANY,
int index = -1); int index = -1);
bool LoadFile(const wxString& name, const wxString& mimetype, bool LoadFile(const wxString& name, const wxString& mimetype,
int index = -1); int index = -1);
bool LoadFile(wxInputStream& stream, long type, bool LoadFile(wxInputStream& stream, long type,
int index = -1); int index = -1);
bool LoadFile(wxInputStream& stream, bool LoadFile(wxInputStream& stream,
const wxString& mimetype, const wxString& mimetype,
int index = -1); int index = -1);
//@} //@}
/** /**
@@ -897,8 +897,8 @@ public:
and RGBtoHSV(), which and RGBtoHSV(), which
converts between HSV color space and RGB color space. converts between HSV color space and RGB color space.
*/ */
RGBValue(unsigned char r = 0, unsigned char g = 0, RGBValue(unsigned char r = 0, unsigned char g = 0,
unsigned char b = 0); unsigned char b = 0);
/** /**
Converts a color in RGB color space to HSV color space. Converts a color in RGB color space to HSV color space.
@@ -1053,11 +1053,11 @@ public:
@sa LoadFile() @sa LoadFile()
*/ */
bool SaveFile(const wxString& name, int type); bool SaveFile(const wxString& name, int type);
bool SaveFile(const wxString& name, const wxString& mimetype); bool SaveFile(const wxString& name, const wxString& mimetype);
bool SaveFile(const wxString& name); bool SaveFile(const wxString& name);
bool SaveFile(wxOutputStream& stream, int type); bool SaveFile(wxOutputStream& stream, int type);
bool SaveFile(wxOutputStream& stream, bool SaveFile(wxOutputStream& stream,
const wxString& mimetype); const wxString& mimetype);
//@} //@}
/** /**
@@ -1110,7 +1110,7 @@ public:
*/ */
void SetAlpha(unsigned char * alpha = @NULL, void SetAlpha(unsigned char * alpha = @NULL,
bool static_data = @false); bool static_data = @false);
void SetAlpha(int x, int y, unsigned char alpha); void SetAlpha(int x, int y, unsigned char alpha);
//@} //@}
/** /**
@@ -1166,7 +1166,7 @@ public:
@sa GetOption(), GetOptionInt(), HasOption() @sa GetOption(), GetOptionInt(), HasOption()
*/ */
void SetOption(const wxString& name, const wxString& value); void SetOption(const wxString& name, const wxString& value);
void SetOption(const wxString& name, int value); void SetOption(const wxString& name, int value);
//@} //@}
/** /**
@@ -1183,8 +1183,8 @@ public:
data. data.
*/ */
#define void SetRGB(wxRect & rect, unsigned char red, #define void SetRGB(wxRect & rect, unsigned char red,
unsigned char green, unsigned char green,
unsigned char blue) /* implementation is private */ unsigned char blue) /* implementation is private */
/** /**
Returns a resized version of this image without scaling it by adding either a Returns a resized version of this image without scaling it by adding either a

10
interface/imaglist.h
View File

@@ -47,8 +47,8 @@ public:
@sa Create() @sa Create()
*/ */
wxImageList(); wxImageList();
wxImageList(int width, int height, bool mask = @true, wxImageList(int width, int height, bool mask = @true,
int initialCount = 1); int initialCount = 1);
//@} //@}
//@{ //@{
@@ -74,8 +74,8 @@ public:
*/ */
int Add(const wxBitmap& bitmap, int Add(const wxBitmap& bitmap,
const wxBitmap& mask = wxNullBitmap); const wxBitmap& mask = wxNullBitmap);
int Add(const wxBitmap& bitmap, const wxColour& maskColour); int Add(const wxBitmap& bitmap, const wxColour& maskColour);
int Add(const wxIcon& icon); int Add(const wxIcon& icon);
//@} //@}
/** /**
@@ -193,6 +193,6 @@ public:
*/ */
bool Replace(int index, const wxBitmap& bitmap, bool Replace(int index, const wxBitmap& bitmap,
const wxBitmap& mask = wxNullBitmap); const wxBitmap& mask = wxNullBitmap);
bool Replace(int index, const wxIcon& icon); bool Replace(int index, const wxIcon& icon);
//@} //@}
}; };

26
interface/init.h
View File

@@ -1,27 +1,27 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: init.h // Name: init.h
// Purpose: documentation for global functions // Purpose: documentation for global functions
// Author: wxWidgets team // Author: wxWidgets team
// RCS-ID: $Id$ // RCS-ID: $Id$
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** /**
Free resources allocated by a successful call to wxEntryStart. Free resources allocated by a successful call to wxEntryStart.
*/ */
void wxEntryCleanup(); void wxEntryCleanup();
//@{ //@{
/** /**
(notice that under Windows CE platform, and only there, the type of (notice that under Windows CE platform, and only there, the type of
@e pCmdLine is @c wchar_t *, otherwise it is @c char *, even in @e pCmdLine is @c wchar_t *, otherwise it is @c char *, even in
Unicode build). Unicode build).
*/ */
bool wxEntryStart(int& argc, wxChar ** argv); bool wxEntryStart(int& argc, wxChar ** argv);
bool wxEntryStart(HINSTANCE hInstance, bool wxEntryStart(HINSTANCE hInstance,
HINSTANCE hPrevInstance = @NULL, HINSTANCE hPrevInstance = @NULL,
char * pCmdLine = @NULL, char * pCmdLine = @NULL,
int nCmdShow = SW_SHOWNORMAL); int nCmdShow = SW_SHOWNORMAL);
//@} //@}

58
interface/intl.h
View File

@@ -73,14 +73,14 @@ public:
translate the messages using the message catalogs for this locale. translate the messages using the message catalogs for this locale.
*/ */
wxLocale(); wxLocale();
wxLocale(int language, wxLocale(int language,
int flags = int flags =
wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
wxLocale(const wxString& name, wxLocale(const wxString& name,
const wxString& short = wxEmptyString, const wxString& short = wxEmptyString,
const wxString& locale = wxEmptyString, const wxString& locale = wxEmptyString,
bool bLoadDefault = @true, bool bLoadDefault = @true,
bool bConvertEncoding = @false); bool bConvertEncoding = @false);
//@} //@}
/** /**
@@ -128,9 +128,9 @@ public:
@ref overview_nonenglishoverview "Writing non-English applications". @ref overview_nonenglishoverview "Writing non-English applications".
*/ */
bool AddCatalog(const wxString& domain); bool AddCatalog(const wxString& domain);
bool AddCatalog(const wxString& domain, bool AddCatalog(const wxString& domain,
wxLanguage msgIdLanguage, wxLanguage msgIdLanguage,
const wxString& msgIdCharset); const wxString& msgIdCharset);
//@} //@}
/** /**
@@ -263,10 +263,10 @@ public:
*/ */
const wxString GetString(const wxString& origString, const wxString GetString(const wxString& origString,
const wxString& domain = wxEmptyString); const wxString& domain = wxEmptyString);
const wxString GetString(const wxString& origString, const wxString GetString(const wxString& origString,
const wxString& origString2, const wxString& origString2,
size_t n, size_t n,
const wxString& domain = @NULL); const wxString& domain = @NULL);
//@} //@}
/** /**
@@ -358,12 +358,12 @@ public:
*/ */
bool Init(int language = wxLANGUAGE_DEFAULT, bool Init(int language = wxLANGUAGE_DEFAULT,
int flags = int flags =
wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
bool Init(const wxString& name, bool Init(const wxString& name,
const wxString& short = wxEmptyString, const wxString& short = wxEmptyString,
const wxString& locale = wxEmptyString, const wxString& locale = wxEmptyString,
bool bLoadDefault = @true, bool bLoadDefault = @true,
bool bConvertEncoding = @false); bool bConvertEncoding = @false);
//@} //@}
/** /**
@@ -481,8 +481,8 @@ public:
portability. portability.
*/ */
wxLocale(); wxLocale();
wxLocale(wxLanguage lang); wxLocale(wxLanguage lang);
wxLocale(const char * loc); wxLocale(const char * loc);
//@} //@}
/** /**
@@ -561,8 +561,8 @@ public:
of wxGetTranslation. of wxGetTranslation.
*/ */
#define const wxString wxPLURAL(const wxString& sing, #define const wxString wxPLURAL(const wxString& sing,
const wxString& plur, const wxString& plur,
size_t n) /* implementation is private */ size_t n) /* implementation is private */
/** /**
This macro doesn't do anything in the program code -- it simply expands to the This macro doesn't do anything in the program code -- it simply expands to the
@@ -653,9 +653,9 @@ public:
*/ */
const wxString wxGetTranslation(const wxString& str, const wxString wxGetTranslation(const wxString& str,
const wxString& domain = wxEmptyString); const wxString& domain = wxEmptyString);
const wxString wxGetTranslation(const wxString& str, const wxString wxGetTranslation(const wxString& str,
const wxString& strPlural, const wxString& strPlural,
size_t n, size_t n,
const wxString& domain = wxEmptyString); const wxString& domain = wxEmptyString);
//@} //@}

Some files were not shown because too many files have changed in this diff Show More