projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
document wxFont(wxString) ctor
[wxWidgets.git]
/
interface
/
wx
/
archive.h
diff --git
a/interface/wx/archive.h
b/interface/wx/archive.h
index 88ca8cbf9617df544e96414db311d1fe93fa740b..1bb6579bfe5d5093ded07feb29e1eb1cf5797423 100644
(file)
--- a/
interface/wx/archive.h
+++ b/
interface/wx/archive.h
@@
-347,7
+347,7
@@
public:
When using wxSTREAM_FILEEXT for the second parameter, the first parameter
can be a complete filename rather than just an extension.
*/
When using wxSTREAM_FILEEXT for the second parameter, the first parameter
can be a complete filename rather than just an extension.
*/
- bool CanHandle(const wx
Char*
protocol,
+ bool CanHandle(const wx
String&
protocol,
wxStreamProtocolType type = wxSTREAM_PROTOCOL) const;
/**
wxStreamProtocolType type = wxSTREAM_PROTOCOL) const;
/**
@@
-358,7
+358,7
@@
public:
When using wxSTREAM_FILEEXT for the second parameter, the first parameter
can be a complete filename rather than just an extension.
*/
When using wxSTREAM_FILEEXT for the second parameter, the first parameter
can be a complete filename rather than just an extension.
*/
- static const wxArchiveClassFactory* Find(const wx
Char*
protocol,
+ static const wxArchiveClassFactory* Find(const wx
String&
protocol,
wxStreamProtocolType type = wxSTREAM_PROTOCOL);
/**
wxStreamProtocolType type = wxSTREAM_PROTOCOL);
/**
@@
-366,7
+366,7
@@
public:
translating meta-data. The initial default, set by the constructor,
is wxConvLocal.
*/
translating meta-data. The initial default, set by the constructor,
is wxConvLocal.
*/
- wxMBConv GetConv() const;
+ wxMBConv
&
GetConv() const;
/**
Sets the wxMBConv object that the created streams will use when
/**
Sets the wxMBConv object that the created streams will use when
@@
-392,7
+392,7
@@
public:
GetFirst() and GetNext() return a pointer to a factory or @NULL if no more
are available. They do not give away ownership of the factory.
*/
GetFirst() and GetNext() return a pointer to a factory or @NULL if no more
are available. They do not give away ownership of the factory.
*/
- static const wxArchiveClassFactory* GetFirst()
const
;
+ static const wxArchiveClassFactory* GetFirst();
const wxArchiveClassFactory* GetNext() const;
//@}
const wxArchiveClassFactory* GetNext() const;
//@}
@@
-400,8
+400,8
@@
public:
Calls the static GetInternalName() function for the archive entry type,
for example wxZipEntry::GetInternalName.
*/
Calls the static GetInternalName() function for the archive entry type,
for example wxZipEntry::GetInternalName.
*/
- wxString GetInternalName(const wxString& name,
-
wxPathFormat format = wxPATH_NATIVE) const
;
+
virtual
wxString GetInternalName(const wxString& name,
+
wxPathFormat format = wxPATH_NATIVE) const = 0
;
/**
Returns the wxFileSystem protocol supported by this factory.
/**
Returns the wxFileSystem protocol supported by this factory.
@@
-422,9
+422,9
@@
public:
for (p = factory->GetProtocols(wxSTREAM_FILEEXT); *p; p++)
list << *p << _T("\n");
for (p = factory->GetProtocols(wxSTREAM_FILEEXT); *p; p++)
list << *p << _T("\n");
- @encode
+ @en
d
code
*/
*/
-
const wxChar* const* GetProtocols(wxStreamProtocolType type = wxSTREAM_PROTOCOL) const
;
+
virtual const wxChar** GetProtocols(wxStreamProtocolType type = wxSTREAM_PROTOCOL) const = 0
;
/**
Create a new wxArchiveEntry object of the appropriate type.
/**
Create a new wxArchiveEntry object of the appropriate type.
@@
-499,7
+499,7
@@
public:
/**
This method must be overridden in your derived class.
*/
/**
This method must be overridden in your derived class.
*/
- v
oid OnEntryUpdated(class wxArchiveEntry& entry)
;
+ v
irtual void OnEntryUpdated(wxArchiveEntry& entry) = 0
;
};
};
@@
-513,7
+513,7
@@
public:
supports member templates.
@code
supports member templates.
@code
- template
class Arc, class T = typename Arc::entry_type*
+ template
<class Arc, class T = typename Arc::entry_type*>
class wxArchiveIterator
{
// this constructor creates an 'end of sequence' object
class wxArchiveIterator
{
// this constructor creates an 'end of sequence' object
@@
-528,8
+528,8
@@
public:
The first template parameter should be the type of archive input stream
(e.g. wxArchiveInputStream) and the second can either be a pointer to an entry
The first template parameter should be the type of archive input stream
(e.g. wxArchiveInputStream) and the second can either be a pointer to an entry
- (e.g. wxArchiveEntry*), or a string/pointer pair
(e.g. std::pairwxString,
-
wxArchiveEntry*
).
+ (e.g. wxArchiveEntry*), or a string/pointer pair
+
(e.g. std::pair<wxString,wxArchiveEntry*>
).
The @c wx/archive.h header defines the following typedefs:
The @c wx/archive.h header defines the following typedefs: