Remove all trailing spaces
No real changes, just clean up sources by removing trailing spaces from all the non-generated files. This should hopefully avoid future commits mixing significant changes with insignificant whitespace ones.
This commit is contained in:
@@ -733,10 +733,10 @@ All (GUI):
|
|||||||
- Support hexadecimal numbers in wxSpinCtrl.
|
- Support hexadecimal numbers in wxSpinCtrl.
|
||||||
- Respect window max size in wxBoxSizer (Nathan Ridge).
|
- Respect window max size in wxBoxSizer (Nathan Ridge).
|
||||||
- Add support for searching in wxWebView for MSW and GTK (Allonii).
|
- Add support for searching in wxWebView for MSW and GTK (Allonii).
|
||||||
- Add generic wxFileSystem support to wxWebView with
|
- Add generic wxFileSystem support to wxWebView with
|
||||||
wxWebViewFSHandler (Nick Matthews).
|
wxWebViewFSHandler (Nick Matthews).
|
||||||
- Add possibility to disable context menu in wxWebView.
|
- Add possibility to disable context menu in wxWebView.
|
||||||
- Add ability to register custom wxWebView backends using
|
- Add ability to register custom wxWebView backends using
|
||||||
wxWebView::RegisterFactory and a wxWebViewFactory derived class.
|
wxWebView::RegisterFactory and a wxWebViewFactory derived class.
|
||||||
- Add possibility to hide and show again wxRibbonBar pages (wxBen).
|
- Add possibility to hide and show again wxRibbonBar pages (wxBen).
|
||||||
- Add wxRibbonBar pages highlighting (wxBen).
|
- Add wxRibbonBar pages highlighting (wxBen).
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
@defgroup group_class_webview WebView
|
@defgroup group_class_webview WebView
|
||||||
@ingroup group_class
|
@ingroup group_class
|
||||||
|
|
||||||
The wxWebView library is a set of classes for viewing complex web documents and
|
The wxWebView library is a set of classes for viewing complex web documents and
|
||||||
for internet browsing. It is built around a series of backends, and exposes
|
for internet browsing. It is built around a series of backends, and exposes
|
||||||
common functions for them.
|
common functions for them.
|
||||||
|
|
||||||
|
@@ -19,7 +19,7 @@ and keep in mind that the wxWidgets function takes as last parameter the
|
|||||||
locale which should be internally used for locale-dependent operations.
|
locale which should be internally used for locale-dependent operations.
|
||||||
|
|
||||||
Last, note that when the @c wxHAS_XLOCALE_SUPPORT symbol is not defined,
|
Last, note that when the @c wxHAS_XLOCALE_SUPPORT symbol is not defined,
|
||||||
then wxWidgets will provide implementations of these functions itself
|
then wxWidgets will provide implementations of these functions itself
|
||||||
and that they are not granted to be thread-safe (and they will work only with the
|
and that they are not granted to be thread-safe (and they will work only with the
|
||||||
C locale; see @ref xlocale_avail).
|
C locale; see @ref xlocale_avail).
|
||||||
|
|
||||||
|
@@ -29,7 +29,7 @@ identifiers are all in the range between @c wxID_LOWEST and
|
|||||||
@c wxID_HIGHEST and, accordingly, the user code should avoid defining its
|
@c wxID_HIGHEST and, accordingly, the user code should avoid defining its
|
||||||
own constants in this range (e.g. by using wxNewId()).
|
own constants in this range (e.g. by using wxNewId()).
|
||||||
|
|
||||||
Refer to @ref page_stockitems "the list of stock items" for the subset of standard IDs
|
Refer to @ref page_stockitems "the list of stock items" for the subset of standard IDs
|
||||||
which are stock IDs as well.
|
which are stock IDs as well.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
@@ -103,7 +103,7 @@ without express or implied warranty.
|
|||||||
@verbinclude "lgpl.txt"
|
@verbinclude "lgpl.txt"
|
||||||
|
|
||||||
@page page_copyright_xserver The Open Group and DEC License
|
@page page_copyright_xserver The Open Group and DEC License
|
||||||
|
|
||||||
@verbinclude "xserver.txt"
|
@verbinclude "xserver.txt"
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
@@ -914,7 +914,7 @@ control.
|
|||||||
|
|
||||||
The wxWebView sample demonstarates the various capabilities of the wxWebView
|
The wxWebView sample demonstarates the various capabilities of the wxWebView
|
||||||
control. It is set up as a simple single window web browser, but with support
|
control. It is set up as a simple single window web browser, but with support
|
||||||
for many of the more complex wxWebView features, including browsing through
|
for many of the more complex wxWebView features, including browsing through
|
||||||
archives.
|
archives.
|
||||||
|
|
||||||
@sampledir{webview}
|
@sampledir{webview}
|
||||||
|
@@ -21,7 +21,7 @@ debugging. Both assertions and debug logging are also used by wxWidgets itself
|
|||||||
so you may encounter them even if you don't use either of these features
|
so you may encounter them even if you don't use either of these features
|
||||||
yourself.
|
yourself.
|
||||||
|
|
||||||
@see wxLog, @ref group_funcmacro_log, @ref group_funcmacro_debug
|
@see wxLog, @ref group_funcmacro_log, @ref group_funcmacro_debug
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -86,7 +86,7 @@ use Wx ':docview'; # import constants (optional)
|
|||||||
@endcode
|
@endcode
|
||||||
@endWxPerlOnly
|
@endWxPerlOnly
|
||||||
|
|
||||||
@see @ref group_class_docview,
|
@see @ref group_class_docview,
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -614,7 +614,7 @@ custom event types.
|
|||||||
Finally, you will need to generate and post your custom events.
|
Finally, you will need to generate and post your custom events.
|
||||||
Generation is as simple as instancing your custom event class and initializing
|
Generation is as simple as instancing your custom event class and initializing
|
||||||
its internal fields.
|
its internal fields.
|
||||||
For posting events to a certain event handler there are two possibilities:
|
For posting events to a certain event handler there are two possibilities:
|
||||||
using wxEvtHandler::AddPendingEvent or using wxEvtHandler::QueueEvent.
|
using wxEvtHandler::AddPendingEvent or using wxEvtHandler::QueueEvent.
|
||||||
Basically you will need to use the latter when doing inter-thread communication;
|
Basically you will need to use the latter when doing inter-thread communication;
|
||||||
when you use only the main thread you can also safely use the former.
|
when you use only the main thread you can also safely use the former.
|
||||||
|
@@ -19,9 +19,9 @@ as well as several standard implementations of it and a family of functions to
|
|||||||
use with them.
|
use with them.
|
||||||
|
|
||||||
First of all, no knowledge of wxLog classes is needed to use them. For this,
|
First of all, no knowledge of wxLog classes is needed to use them. For this,
|
||||||
you should only know about @ref group_funcmacro_log "wxLogXXX() functions".
|
you should only know about @ref group_funcmacro_log "wxLogXXX() functions".
|
||||||
All of them have the same syntax as @e printf() or @e vprintf() , i.e. they
|
All of them have the same syntax as @e printf() or @e vprintf() , i.e. they
|
||||||
take the format string as the first argument and respectively a variable number
|
take the format string as the first argument and respectively a variable number
|
||||||
of arguments or a variable argument list pointer. Here are all of them:
|
of arguments or a variable argument list pointer. Here are all of them:
|
||||||
|
|
||||||
@li wxLogFatalError() which is like wxLogError(), but also terminates the program
|
@li wxLogFatalError() which is like wxLogError(), but also terminates the program
|
||||||
@@ -161,8 +161,8 @@ works.
|
|||||||
wxWidgets has the notion of a <em>log target</em>: it is just a class deriving
|
wxWidgets has the notion of a <em>log target</em>: it is just a class deriving
|
||||||
from wxLog. As such, it implements the virtual functions of the base class
|
from wxLog. As such, it implements the virtual functions of the base class
|
||||||
which are called when a message is logged. Only one log target is @e active at
|
which are called when a message is logged. Only one log target is @e active at
|
||||||
any moment, this is the one used by @ref group_funcmacro_log "wxLogXXX() functions".
|
any moment, this is the one used by @ref group_funcmacro_log "wxLogXXX() functions".
|
||||||
The normal usage of a log object (i.e. object of a class derived from wxLog) is
|
The normal usage of a log object (i.e. object of a class derived from wxLog) is
|
||||||
to install it as the active target with a call to @e SetActiveTarget() and it
|
to install it as the active target with a call to @e SetActiveTarget() and it
|
||||||
will be used automatically by all subsequent calls to
|
will be used automatically by all subsequent calls to
|
||||||
@ref group_funcmacro_log "wxLogXXX() functions".
|
@ref group_funcmacro_log "wxLogXXX() functions".
|
||||||
@@ -263,7 +263,7 @@ GUI is (already/still) available when your log target as used as wxWidgets
|
|||||||
automatically switches to using wxLogStderr if it isn't.
|
automatically switches to using wxLogStderr if it isn't.
|
||||||
|
|
||||||
There are several methods which may be overridden in the derived class to
|
There are several methods which may be overridden in the derived class to
|
||||||
customize log messages handling: wxLog::DoLogRecord(), wxLog::DoLogTextAtLevel()
|
customize log messages handling: wxLog::DoLogRecord(), wxLog::DoLogTextAtLevel()
|
||||||
and wxLog::DoLogText().
|
and wxLog::DoLogText().
|
||||||
|
|
||||||
The last method is the simplest one: you should override it if you simply
|
The last method is the simplest one: you should override it if you simply
|
||||||
|
@@ -733,10 +733,10 @@ accomplish the task:
|
|||||||
@code
|
@code
|
||||||
// Have property editor focus on Enter
|
// Have property editor focus on Enter
|
||||||
propgrid->AddActionTrigger( wxPG_ACTION_EDIT, WXK_RETURN );
|
propgrid->AddActionTrigger( wxPG_ACTION_EDIT, WXK_RETURN );
|
||||||
|
|
||||||
// Have Enter work as action trigger even when editor is focused
|
// Have Enter work as action trigger even when editor is focused
|
||||||
propgrid->DedicateKey( WXK_RETURN );
|
propgrid->DedicateKey( WXK_RETURN );
|
||||||
|
|
||||||
// Let Enter also navigate to the next property
|
// Let Enter also navigate to the next property
|
||||||
propgrid->AddActionTrigger( wxPG_ACTION_NEXT_PROPERTY, WXK_RETURN );
|
propgrid->AddActionTrigger( wxPG_ACTION_NEXT_PROPERTY, WXK_RETURN );
|
||||||
|
|
||||||
|
@@ -15,7 +15,7 @@ Sizers, as represented by the wxSizer class and its descendants in the
|
|||||||
wxWidgets class hierarchy, have become the method of choice to define the
|
wxWidgets class hierarchy, have become the method of choice to define the
|
||||||
layout of controls in dialogs in wxWidgets because of their ability to create
|
layout of controls in dialogs in wxWidgets because of their ability to create
|
||||||
visually appealing dialogs independent of the platform, taking into account
|
visually appealing dialogs independent of the platform, taking into account
|
||||||
the differences in size and style of the individual controls.
|
the differences in size and style of the individual controls.
|
||||||
|
|
||||||
The next section describes and shows what can be done with sizers. The
|
The next section describes and shows what can be done with sizers. The
|
||||||
following sections briefly describe how to program with individual sizer
|
following sections briefly describe how to program with individual sizer
|
||||||
@@ -211,7 +211,7 @@ window will preserve it is original size, @c wxGROW flag (same as @c wxEXPAND) f
|
|||||||
the window to grow with the sizer, and @c wxSHAPED flag tells the window to change
|
the window to grow with the sizer, and @c wxSHAPED flag tells the window to change
|
||||||
it is size proportionally, preserving original aspect ratio. When @c wxGROW flag
|
it is size proportionally, preserving original aspect ratio. When @c wxGROW flag
|
||||||
is not used, the item can be aligned within available space. @c wxALIGN_LEFT,
|
is not used, the item can be aligned within available space. @c wxALIGN_LEFT,
|
||||||
@c wxALIGN_TOP, @c wxALIGN_RIGHT, @c wxALIGN_BOTTOM, @c wxALIGN_CENTER_HORIZONTAL
|
@c wxALIGN_TOP, @c wxALIGN_RIGHT, @c wxALIGN_BOTTOM, @c wxALIGN_CENTER_HORIZONTAL
|
||||||
and @c wxALIGN_CENTER_VERTICAL do what they say. @c wxALIGN_CENTRE (same as
|
and @c wxALIGN_CENTER_VERTICAL do what they say. @c wxALIGN_CENTRE (same as
|
||||||
@c wxALIGN_CENTER) is defined as (<tt>wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL</tt>).
|
@c wxALIGN_CENTER) is defined as (<tt>wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL</tt>).
|
||||||
Default alignment is <tt>wxALIGN_LEFT | wxALIGN_TOP</tt>.
|
Default alignment is <tt>wxALIGN_LEFT | wxALIGN_TOP</tt>.
|
||||||
@@ -267,7 +267,7 @@ MyDialog::MyDialog(wxFrame *parent, wxWindowID id, const wxString &title )
|
|||||||
}
|
}
|
||||||
@endcode
|
@endcode
|
||||||
|
|
||||||
Note that the recommended way of specifying flags to wxSizer is via wxSizerFlags.
|
Note that the recommended way of specifying flags to wxSizer is via wxSizerFlags.
|
||||||
This class greatly eases the burden of passing flags to a wxSizer.
|
This class greatly eases the burden of passing flags to a wxSizer.
|
||||||
|
|
||||||
Here's how you'd do the previous example with wxSizerFlags:
|
Here's how you'd do the previous example with wxSizerFlags:
|
||||||
@@ -313,18 +313,18 @@ MyDialog::MyDialog(wxFrame *parent, wxWindowID id, const wxString &title )
|
|||||||
|
|
||||||
@section overview_sizer_types Other Types of Sizers
|
@section overview_sizer_types Other Types of Sizers
|
||||||
|
|
||||||
wxStdDialogButtonSizer is a sizer that creates button layouts in dialogs
|
wxStdDialogButtonSizer is a sizer that creates button layouts in dialogs
|
||||||
which conform to the standard button spacing and ordering defined by
|
which conform to the standard button spacing and ordering defined by
|
||||||
the platform or toolkit's user interface guidelines (if such things exist).
|
the platform or toolkit's user interface guidelines (if such things exist).
|
||||||
As a convenience, wxDialog::CreateButtonSizer() can be used to create this sizer.
|
As a convenience, wxDialog::CreateButtonSizer() can be used to create this sizer.
|
||||||
|
|
||||||
wxWrapSizer is a sizer that lays out its items in a single line, like a box
|
wxWrapSizer is a sizer that lays out its items in a single line, like a box
|
||||||
sizer -- as long as there is space available in that direction. Once all available
|
sizer -- as long as there is space available in that direction. Once all available
|
||||||
space in the primary direction has been used, a new line is added and items
|
space in the primary direction has been used, a new line is added and items
|
||||||
are added there.
|
are added there.
|
||||||
|
|
||||||
wxGridBagSizer is a rather special kind of sizer which, unlike the other
|
wxGridBagSizer is a rather special kind of sizer which, unlike the other
|
||||||
classes, allows to directly put the elements at the given position in the
|
classes, allows to directly put the elements at the given position in the
|
||||||
sizer.
|
sizer.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
@@ -16,14 +16,14 @@ class CBuilder:
|
|||||||
output_dir = os.path.abspath(os.path.join(self.output_dir, "c"))
|
output_dir = os.path.abspath(os.path.join(self.output_dir, "c"))
|
||||||
if not os.path.exists(output_dir):
|
if not os.path.exists(output_dir):
|
||||||
os.makedirs(output_dir)
|
os.makedirs(output_dir)
|
||||||
|
|
||||||
for aclass in self.doxyparser.classes:
|
for aclass in self.doxyparser.classes:
|
||||||
# This bit doesn't work, because the aclass.name is not the same as
|
# This bit doesn't work, because the aclass.name is not the same as
|
||||||
# those listed in common
|
# those listed in common
|
||||||
if aclass.name in excluded_classes:
|
if aclass.name in excluded_classes:
|
||||||
#print "Skipping %s" % aclass.name
|
#print "Skipping %s" % aclass.name
|
||||||
continue
|
continue
|
||||||
|
|
||||||
self.make_c_header(output_dir, aclass)
|
self.make_c_header(output_dir, aclass)
|
||||||
|
|
||||||
|
|
||||||
@@ -46,7 +46,7 @@ class CBuilder:
|
|||||||
|
|
||||||
def make_c_methods(self, aclass):
|
def make_c_methods(self, aclass):
|
||||||
retval = ""
|
retval = ""
|
||||||
|
|
||||||
wxc_classname = 'wxC' + aclass.name[2:].capitalize()
|
wxc_classname = 'wxC' + aclass.name[2:].capitalize()
|
||||||
|
|
||||||
for amethod in aclass.constructors:
|
for amethod in aclass.constructors:
|
||||||
@@ -59,13 +59,13 @@ class CBuilder:
|
|||||||
if amethod.name.startswith('m_'):
|
if amethod.name.startswith('m_'):
|
||||||
# for some reason, public members are listed as methods
|
# for some reason, public members are listed as methods
|
||||||
continue
|
continue
|
||||||
|
|
||||||
args = '(' + wxc_classname + '* obj'
|
args = '(' + wxc_classname + '* obj'
|
||||||
if amethod.argsstring.find('()') != -1:
|
if amethod.argsstring.find('()') != -1:
|
||||||
args += ')'
|
args += ')'
|
||||||
else:
|
else:
|
||||||
args += ', ' + amethod.argsstring[1:].strip()
|
args += ', ' + amethod.argsstring[1:].strip()
|
||||||
|
|
||||||
retval += """
|
retval += """
|
||||||
// %s
|
// %s
|
||||||
%s %s%s;\n
|
%s %s%s;\n
|
||||||
|
@@ -15,7 +15,7 @@ excluded_classes = [
|
|||||||
"wxArchiveIterator",
|
"wxArchiveIterator",
|
||||||
"wxArchiveNotifier",
|
"wxArchiveNotifier",
|
||||||
"wxArchiveOutputStream",
|
"wxArchiveOutputStream",
|
||||||
"wxArray< T >",
|
"wxArray< T >",
|
||||||
"wxArrayString",
|
"wxArrayString",
|
||||||
"wxAutomationObject",
|
"wxAutomationObject",
|
||||||
"wxBufferedInputStream",
|
"wxBufferedInputStream",
|
||||||
@@ -160,5 +160,5 @@ def make_enums(aclass):
|
|||||||
retval += ", "
|
retval += ", "
|
||||||
retval += "\n"
|
retval += "\n"
|
||||||
retval += "};\n\n"
|
retval += "};\n\n"
|
||||||
|
|
||||||
return retval
|
return retval
|
||||||
|
@@ -38,23 +38,23 @@ class ClassDefinition:
|
|||||||
self.includes = []
|
self.includes = []
|
||||||
self.bases = []
|
self.bases = []
|
||||||
self.enums = {}
|
self.enums = {}
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
str_repr = """
|
str_repr = """
|
||||||
Class: %s
|
Class: %s
|
||||||
Bases: %s
|
Bases: %s
|
||||||
Includes: %s
|
Includes: %s
|
||||||
Brief Description:
|
Brief Description:
|
||||||
%s
|
%s
|
||||||
|
|
||||||
Detailed Description:
|
Detailed Description:
|
||||||
%s
|
%s
|
||||||
""" % (self.name, string.join(self.bases, ", "), self.includes, self.brief_description, self.detailed_description)
|
""" % (self.name, string.join(self.bases, ", "), self.includes, self.brief_description, self.detailed_description)
|
||||||
str_repr += "Methods:\n"
|
str_repr += "Methods:\n"
|
||||||
|
|
||||||
for method in self.methods:
|
for method in self.methods:
|
||||||
str_repr += str(method)
|
str_repr += str(method)
|
||||||
|
|
||||||
return str_repr
|
return str_repr
|
||||||
|
|
||||||
class MethodDefinition:
|
class MethodDefinition:
|
||||||
@@ -66,20 +66,20 @@ class MethodDefinition:
|
|||||||
self.params = []
|
self.params = []
|
||||||
self.brief_description = ""
|
self.brief_description = ""
|
||||||
self.detailed_description = ""
|
self.detailed_description = ""
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
str_repr = """
|
str_repr = """
|
||||||
Method: %s
|
Method: %s
|
||||||
Return Type: %s
|
Return Type: %s
|
||||||
Params: %r
|
Params: %r
|
||||||
Prototype: %s
|
Prototype: %s
|
||||||
Brief Description:
|
Brief Description:
|
||||||
%s
|
%s
|
||||||
|
|
||||||
Detailed Description:
|
Detailed Description:
|
||||||
%s
|
%s
|
||||||
""" % (self.name, self.return_type, self.params, self.definition + self.argsstring, self.brief_description, self.detailed_description)
|
""" % (self.name, self.return_type, self.params, self.definition + self.argsstring, self.brief_description, self.detailed_description)
|
||||||
return str_repr
|
return str_repr
|
||||||
|
|
||||||
def getTextValue(node, recursive=False):
|
def getTextValue(node, recursive=False):
|
||||||
text = ""
|
text = ""
|
||||||
@@ -89,7 +89,7 @@ def getTextValue(node, recursive=False):
|
|||||||
if child.nodeType == child.TEXT_NODE:
|
if child.nodeType == child.TEXT_NODE:
|
||||||
# Add a space to ensure we have a space between qualifiers and parameter names
|
# Add a space to ensure we have a space between qualifiers and parameter names
|
||||||
text += child.nodeValue.strip() + " "
|
text += child.nodeValue.strip() + " "
|
||||||
|
|
||||||
return text.strip()
|
return text.strip()
|
||||||
|
|
||||||
def doxyMLToText(node):
|
def doxyMLToText(node):
|
||||||
@@ -104,7 +104,7 @@ class DoxyMLParser:
|
|||||||
for aclass in self.classes:
|
for aclass in self.classes:
|
||||||
if aclass.name == name:
|
if aclass.name == name:
|
||||||
return aclass
|
return aclass
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def get_enums_and_functions(self, filename, aclass):
|
def get_enums_and_functions(self, filename, aclass):
|
||||||
@@ -119,17 +119,17 @@ class DoxyMLParser:
|
|||||||
def is_derived_from_base(self, aclass, abase):
|
def is_derived_from_base(self, aclass, abase):
|
||||||
base = get_first_value(aclass.bases)
|
base = get_first_value(aclass.bases)
|
||||||
while base and base != "":
|
while base and base != "":
|
||||||
|
|
||||||
if base == abase:
|
if base == abase:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
parentclass = self.find_class(base)
|
parentclass = self.find_class(base)
|
||||||
|
|
||||||
if parentclass:
|
if parentclass:
|
||||||
base = get_first_value(parentclass.bases)
|
base = get_first_value(parentclass.bases)
|
||||||
else:
|
else:
|
||||||
base = None
|
base = None
|
||||||
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def parse(self, filename):
|
def parse(self, filename):
|
||||||
@@ -138,7 +138,7 @@ class DoxyMLParser:
|
|||||||
new_class = self.parse_class(node)
|
new_class = self.parse_class(node)
|
||||||
self.classes.append(new_class)
|
self.classes.append(new_class)
|
||||||
self.get_enums_and_functions(filename, new_class)
|
self.get_enums_and_functions(filename, new_class)
|
||||||
|
|
||||||
def parse_class(self, class_node):
|
def parse_class(self, class_node):
|
||||||
new_class = ClassDefinition()
|
new_class = ClassDefinition()
|
||||||
new_class.name = getTextValue(class_node.getElementsByTagName("compoundname")[0])
|
new_class.name = getTextValue(class_node.getElementsByTagName("compoundname")[0])
|
||||||
@@ -156,21 +156,21 @@ class DoxyMLParser:
|
|||||||
self.parse_methods(new_class, class_node)
|
self.parse_methods(new_class, class_node)
|
||||||
|
|
||||||
return new_class
|
return new_class
|
||||||
|
|
||||||
def parse_enum(self, new_class, enum, root):
|
def parse_enum(self, new_class, enum, root):
|
||||||
enum_name = ""
|
enum_name = ""
|
||||||
enum_values = []
|
enum_values = []
|
||||||
|
|
||||||
for node in enum.childNodes:
|
for node in enum.childNodes:
|
||||||
if node.nodeName == "name":
|
if node.nodeName == "name":
|
||||||
enum_name = getTextValue(node)
|
enum_name = getTextValue(node)
|
||||||
elif node.nodeName == "enumvalue":
|
elif node.nodeName == "enumvalue":
|
||||||
enum_values.append(getTextValue(node.getElementsByTagName("name")[0]))
|
enum_values.append(getTextValue(node.getElementsByTagName("name")[0]))
|
||||||
|
|
||||||
new_class.enums[enum_name] = enum_values
|
new_class.enums[enum_name] = enum_values
|
||||||
|
|
||||||
def parse_methods(self, new_class, root):
|
def parse_methods(self, new_class, root):
|
||||||
for method in root.getElementsByTagName("memberdef"):
|
for method in root.getElementsByTagName("memberdef"):
|
||||||
new_method = MethodDefinition()
|
new_method = MethodDefinition()
|
||||||
for node in method.childNodes:
|
for node in method.childNodes:
|
||||||
if node.nodeName == "name":
|
if node.nodeName == "name":
|
||||||
@@ -187,10 +187,10 @@ class DoxyMLParser:
|
|||||||
if child.nodeType == child.ELEMENT_NODE:
|
if child.nodeType == child.ELEMENT_NODE:
|
||||||
param[child.nodeName] = getTextValue(child)
|
param[child.nodeName] = getTextValue(child)
|
||||||
new_method.params.append(param)
|
new_method.params.append(param)
|
||||||
|
|
||||||
if self.verbose:
|
if self.verbose:
|
||||||
print "Adding %s" % (new_method.name + new_method.argsstring)
|
print "Adding %s" % (new_method.name + new_method.argsstring)
|
||||||
|
|
||||||
if new_method.name == new_class.name:
|
if new_method.name == new_class.name:
|
||||||
new_class.constructors.append(new_method)
|
new_class.constructors.append(new_method)
|
||||||
elif new_method.name == "~" + new_class.name:
|
elif new_method.name == "~" + new_class.name:
|
||||||
@@ -199,30 +199,30 @@ class DoxyMLParser:
|
|||||||
new_class.methods.append(new_method)
|
new_class.methods.append(new_method)
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
option_dict = {
|
option_dict = {
|
||||||
"report" : (False, "Print out the classes and methods found by this script."),
|
"report" : (False, "Print out the classes and methods found by this script."),
|
||||||
"verbose" : (False, "Provide status updates and other information."),
|
"verbose" : (False, "Provide status updates and other information."),
|
||||||
}
|
}
|
||||||
|
|
||||||
parser = optparse.OptionParser(usage="usage: %prog [options] <doxyml files to parse>\n" + __description__, version="%prog 1.0")
|
parser = optparse.OptionParser(usage="usage: %prog [options] <doxyml files to parse>\n" + __description__, version="%prog 1.0")
|
||||||
|
|
||||||
for opt in option_dict:
|
for opt in option_dict:
|
||||||
default = option_dict[opt][0]
|
default = option_dict[opt][0]
|
||||||
|
|
||||||
action = "store"
|
action = "store"
|
||||||
if type(default) == types.BooleanType:
|
if type(default) == types.BooleanType:
|
||||||
action = "store_true"
|
action = "store_true"
|
||||||
parser.add_option("--" + opt, default=default, action=action, dest=opt, help=option_dict[opt][1])
|
parser.add_option("--" + opt, default=default, action=action, dest=opt, help=option_dict[opt][1])
|
||||||
|
|
||||||
options, arguments = parser.parse_args()
|
options, arguments = parser.parse_args()
|
||||||
|
|
||||||
if len(arguments) < 1:
|
if len(arguments) < 1:
|
||||||
parser.print_usage()
|
parser.print_usage()
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
doxyparse = DoxyMLParser(verbose = options.verbose)
|
doxyparse = DoxyMLParser(verbose = options.verbose)
|
||||||
for arg in arguments:
|
for arg in arguments:
|
||||||
doxyparse.parse(arg)
|
doxyparse.parse(arg)
|
||||||
|
|
||||||
if options.report:
|
if options.report:
|
||||||
for aclass in doxyparse.classes:
|
for aclass in doxyparse.classes:
|
||||||
|
@@ -12,42 +12,42 @@ import swig_tools
|
|||||||
from common import *
|
from common import *
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
option_dict = {
|
option_dict = {
|
||||||
"output_dir" : ("output", "Directory to output bindings to"),
|
"output_dir" : ("output", "Directory to output bindings to"),
|
||||||
"sip" : (True, "Produce SIP bindings"),
|
"sip" : (True, "Produce SIP bindings"),
|
||||||
"swig" : (True, "Produce SWIG bindings."),
|
"swig" : (True, "Produce SWIG bindings."),
|
||||||
"c" : (True, "Produce C wrappers."),
|
"c" : (True, "Produce C wrappers."),
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
parser = optparse.OptionParser(usage="usage: %prog <doxyml files to parse>\n" , version="%prog 1.0")
|
parser = optparse.OptionParser(usage="usage: %prog <doxyml files to parse>\n" , version="%prog 1.0")
|
||||||
|
|
||||||
for opt in option_dict:
|
for opt in option_dict:
|
||||||
default = option_dict[opt][0]
|
default = option_dict[opt][0]
|
||||||
|
|
||||||
action = "store"
|
action = "store"
|
||||||
if type(default) == types.BooleanType:
|
if type(default) == types.BooleanType:
|
||||||
action = "store_true"
|
action = "store_true"
|
||||||
parser.add_option("--" + opt, default=default, action=action, dest=opt, help=option_dict[opt][1])
|
parser.add_option("--" + opt, default=default, action=action, dest=opt, help=option_dict[opt][1])
|
||||||
|
|
||||||
options, arguments = parser.parse_args()
|
options, arguments = parser.parse_args()
|
||||||
|
|
||||||
if len(arguments) < 1:
|
if len(arguments) < 1:
|
||||||
parser.print_usage()
|
parser.print_usage()
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
doxyparse = doxymlparser.DoxyMLParser()
|
doxyparse = doxymlparser.DoxyMLParser()
|
||||||
for arg in arguments:
|
for arg in arguments:
|
||||||
doxyparse.parse(arg)
|
doxyparse.parse(arg)
|
||||||
|
|
||||||
if options.sip:
|
if options.sip:
|
||||||
builder = sip_tools.SIPBuilder(doxyparse, options.output_dir)
|
builder = sip_tools.SIPBuilder(doxyparse, options.output_dir)
|
||||||
builder.make_bindings()
|
builder.make_bindings()
|
||||||
|
|
||||||
if options.swig:
|
if options.swig:
|
||||||
builder = swig_tools.SWIGBuilder(doxyparse, options.output_dir)
|
builder = swig_tools.SWIGBuilder(doxyparse, options.output_dir)
|
||||||
builder.make_bindings()
|
builder.make_bindings()
|
||||||
|
|
||||||
if options.c:
|
if options.c:
|
||||||
builder = c_tools.CBuilder(doxyparse, options.output_dir)
|
builder = c_tools.CBuilder(doxyparse, options.output_dir)
|
||||||
builder.make_bindings()
|
builder.make_bindings()
|
||||||
|
@@ -11,12 +11,12 @@ class SIPBuilder:
|
|||||||
output_dir = os.path.abspath(os.path.join(self.output_dir, "sip"))
|
output_dir = os.path.abspath(os.path.join(self.output_dir, "sip"))
|
||||||
if not os.path.exists(output_dir):
|
if not os.path.exists(output_dir):
|
||||||
os.makedirs(output_dir)
|
os.makedirs(output_dir)
|
||||||
|
|
||||||
for aclass in self.doxyparser.classes:
|
for aclass in self.doxyparser.classes:
|
||||||
if aclass.name in excluded_classes:
|
if aclass.name in excluded_classes:
|
||||||
print "Skipping %s" % aclass.name
|
print "Skipping %s" % aclass.name
|
||||||
continue
|
continue
|
||||||
|
|
||||||
header_name = aclass.name[2:].lower()
|
header_name = aclass.name[2:].lower()
|
||||||
filename = os.path.join(output_dir, "_" + header_name + ".sip")
|
filename = os.path.join(output_dir, "_" + header_name + ".sip")
|
||||||
enums_text = make_enums(aclass)
|
enums_text = make_enums(aclass)
|
||||||
@@ -24,7 +24,7 @@ class SIPBuilder:
|
|||||||
base_class = get_first_value(aclass.bases)
|
base_class = get_first_value(aclass.bases)
|
||||||
if base_class != "":
|
if base_class != "":
|
||||||
base_class = ": %s" % base_class
|
base_class = ": %s" % base_class
|
||||||
|
|
||||||
text = """
|
text = """
|
||||||
%s
|
%s
|
||||||
class %s %s
|
class %s %s
|
||||||
@@ -45,12 +45,12 @@ public:
|
|||||||
|
|
||||||
def make_sip_methods(self, aclass):
|
def make_sip_methods(self, aclass):
|
||||||
retval = ""
|
retval = ""
|
||||||
|
|
||||||
for amethod in aclass.constructors + aclass.methods:
|
for amethod in aclass.constructors + aclass.methods:
|
||||||
transfer = ""
|
transfer = ""
|
||||||
|
|
||||||
# FIXME: we need to come up with a way of filtering the methods out by various criteria
|
# FIXME: we need to come up with a way of filtering the methods out by various criteria
|
||||||
# including parameters and method name, and how to deal with overloads
|
# including parameters and method name, and how to deal with overloads
|
||||||
if aclass.name in ignored_methods:
|
if aclass.name in ignored_methods:
|
||||||
should_ignore = False
|
should_ignore = False
|
||||||
for method in ignored_methods[aclass.name]:
|
for method in ignored_methods[aclass.name]:
|
||||||
@@ -66,19 +66,19 @@ public:
|
|||||||
print "param type = %s, amethod.param type = %s" % (params[i], amethod.params[i]["type"])
|
print "param type = %s, amethod.param type = %s" % (params[i], amethod.params[i]["type"])
|
||||||
should_ignore = False
|
should_ignore = False
|
||||||
break
|
break
|
||||||
|
|
||||||
if should_ignore:
|
if should_ignore:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# We need to let SIP know when wx is responsible for deleting the object.
|
# We need to let SIP know when wx is responsible for deleting the object.
|
||||||
# We do this if the class is derived from wxWindow, since wxTLW manages child windows
|
# We do this if the class is derived from wxWindow, since wxTLW manages child windows
|
||||||
# and wxApp deletes all wxTLWs on shutdown
|
# and wxApp deletes all wxTLWs on shutdown
|
||||||
if amethod in aclass.constructors and self.doxyparser.is_derived_from_base(aclass, "wxWindow"):
|
if amethod in aclass.constructors and self.doxyparser.is_derived_from_base(aclass, "wxWindow"):
|
||||||
transfer = "/Transfer/"
|
transfer = "/Transfer/"
|
||||||
|
|
||||||
if amethod.name.startswith("operator"):
|
if amethod.name.startswith("operator"):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
retval += " %s %s%s%s;\n\n" % (amethod.return_type.replace("virtual ", ""), amethod.name, amethod.argsstring, transfer)
|
retval += " %s %s%s%s;\n\n" % (amethod.return_type.replace("virtual ", ""), amethod.name, amethod.argsstring, transfer)
|
||||||
|
|
||||||
return retval
|
return retval
|
||||||
|
@@ -11,13 +11,13 @@ class SWIGBuilder:
|
|||||||
output_dir = os.path.abspath(os.path.join(self.output_dir, "swig"))
|
output_dir = os.path.abspath(os.path.join(self.output_dir, "swig"))
|
||||||
if not os.path.exists(output_dir):
|
if not os.path.exists(output_dir):
|
||||||
os.makedirs(output_dir)
|
os.makedirs(output_dir)
|
||||||
|
|
||||||
for aclass in self.doxyparser.classes:
|
for aclass in self.doxyparser.classes:
|
||||||
header_name = aclass.name[2:].lower()
|
header_name = aclass.name[2:].lower()
|
||||||
if aclass.name in excluded_classes:
|
if aclass.name in excluded_classes:
|
||||||
#print "Skipping %s" % aclass.name
|
#print "Skipping %s" % aclass.name
|
||||||
continue
|
continue
|
||||||
|
|
||||||
filename = os.path.join(output_dir, "_" + header_name + ".i")
|
filename = os.path.join(output_dir, "_" + header_name + ".i")
|
||||||
enums_text = make_enums(aclass)
|
enums_text = make_enums(aclass)
|
||||||
method_text = self.make_swig_methods(aclass)
|
method_text = self.make_swig_methods(aclass)
|
||||||
@@ -37,25 +37,25 @@ public:
|
|||||||
afile.write(text)
|
afile.write(text)
|
||||||
afile.close()
|
afile.close()
|
||||||
|
|
||||||
|
|
||||||
def make_swig_methods(self, aclass):
|
def make_swig_methods(self, aclass):
|
||||||
retval = ""
|
retval = ""
|
||||||
|
|
||||||
retval += """
|
retval += """
|
||||||
%%pythonAppend %s "self._setOORInfo(self)"
|
%%pythonAppend %s "self._setOORInfo(self)"
|
||||||
%%pythonAppend %s() ""
|
%%pythonAppend %s() ""
|
||||||
%%typemap(out) %s*; // turn off this typemap
|
%%typemap(out) %s*; // turn off this typemap
|
||||||
""" % (aclass.name, aclass.name, aclass.name)
|
""" % (aclass.name, aclass.name, aclass.name)
|
||||||
|
|
||||||
for amethod in aclass.constructors:
|
for amethod in aclass.constructors:
|
||||||
retval += " %s%s;\n\n" % (amethod.name, amethod.argsstring)
|
retval += " %s%s;\n\n" % (amethod.name, amethod.argsstring)
|
||||||
|
|
||||||
retval += """
|
retval += """
|
||||||
// Turn it back on again
|
// Turn it back on again
|
||||||
%%typemap(out) %s* { $result = wxPyMake_wxObject($1, $owner); }
|
%%typemap(out) %s* { $result = wxPyMake_wxObject($1, $owner); }
|
||||||
""" % aclass.name
|
""" % aclass.name
|
||||||
|
|
||||||
for amethod in aclass.methods:
|
for amethod in aclass.methods:
|
||||||
retval += " %s %s%s;\n\n" % (amethod.return_type, amethod.name, amethod.argsstring)
|
retval += " %s %s%s;\n\n" % (amethod.return_type, amethod.name, amethod.argsstring)
|
||||||
|
|
||||||
return retval
|
return retval
|
||||||
|
@@ -8,7 +8,7 @@ List of classes which should use their native GTK+ equivalents but don't:
|
|||||||
|
|
||||||
- wxTreeCtrl
|
- wxTreeCtrl
|
||||||
Ryan Norton has implemented this
|
Ryan Norton has implemented this
|
||||||
|
|
||||||
- wxListCtrl
|
- wxListCtrl
|
||||||
Could be reimplemeted in terms of wxDataViewCtrl?
|
Could be reimplemeted in terms of wxDataViewCtrl?
|
||||||
|
|
||||||
|
@@ -58,7 +58,7 @@ free library. If the library is modified by someone else and
|
|||||||
passed on, we want its recipients to know that what they have is
|
passed on, we want its recipients to know that what they have is
|
||||||
not the original version, so that any problems introduced by
|
not the original version, so that any problems introduced by
|
||||||
others will not reflect on the original authors' reputations.
|
others will not reflect on the original authors' reputations.
|
||||||
|
|
||||||
Finally, any free program is threatened constantly by software
|
Finally, any free program is threatened constantly by software
|
||||||
patents. We wish to avoid the danger that companies
|
patents. We wish to avoid the danger that companies
|
||||||
distributing free software will individually obtain patent
|
distributing free software will individually obtain patent
|
||||||
@@ -148,7 +148,7 @@ constitute a work based on the Library (independent of the use
|
|||||||
of the Library in a tool for writing it). Whether that is true
|
of the Library in a tool for writing it). Whether that is true
|
||||||
depends on what the Library does and what the program that uses
|
depends on what the Library does and what the program that uses
|
||||||
the Library does.
|
the Library does.
|
||||||
|
|
||||||
1. You may copy and distribute verbatim copies of the Library's
|
1. You may copy and distribute verbatim copies of the Library's
|
||||||
complete source code as you receive it, in any medium, provided
|
complete source code as you receive it, in any medium, provided
|
||||||
that you conspicuously and appropriately publish on each copy an
|
that you conspicuously and appropriately publish on each copy an
|
||||||
@@ -160,7 +160,7 @@ along with the Library.
|
|||||||
You may charge a fee for the physical act of transferring a
|
You may charge a fee for the physical act of transferring a
|
||||||
copy, and you may at your option offer warranty protection in
|
copy, and you may at your option offer warranty protection in
|
||||||
exchange for a fee.
|
exchange for a fee.
|
||||||
|
|
||||||
2. You may modify your copy or copies of the Library or any
|
2. You may modify your copy or copies of the Library or any
|
||||||
portion of it, thus forming a work based on the Library, and
|
portion of it, thus forming a work based on the Library, and
|
||||||
copy and distribute such modifications or work under the terms
|
copy and distribute such modifications or work under the terms
|
||||||
@@ -220,7 +220,7 @@ Public License, version 2, instead of to this License. (If a
|
|||||||
newer version than version 2 of the ordinary GNU General Public
|
newer version than version 2 of the ordinary GNU General Public
|
||||||
License has appeared, then you can specify that version instead
|
License has appeared, then you can specify that version instead
|
||||||
if you wish.) Do not make any other change in these notices.
|
if you wish.) Do not make any other change in these notices.
|
||||||
|
|
||||||
Once this change is made in a given copy, it is irreversible for
|
Once this change is made in a given copy, it is irreversible for
|
||||||
that copy, so the ordinary GNU General Public License applies to
|
that copy, so the ordinary GNU General Public License applies to
|
||||||
all subsequent copies and derivative works made from that copy.
|
all subsequent copies and derivative works made from that copy.
|
||||||
@@ -278,7 +278,7 @@ distribute the object code for the work under the terms of
|
|||||||
Section 6. Any executables containing that work also fall under
|
Section 6. Any executables containing that work also fall under
|
||||||
Section 6, whether or not they are linked directly with the
|
Section 6, whether or not they are linked directly with the
|
||||||
Library itself.
|
Library itself.
|
||||||
|
|
||||||
6. As an exception to the Sections above, you may also compile
|
6. As an exception to the Sections above, you may also compile
|
||||||
or link a "work that uses the Library" with the Library to
|
or link a "work that uses the Library" with the Library to
|
||||||
produce a work containing portions of the Library, and
|
produce a work containing portions of the Library, and
|
||||||
@@ -332,7 +332,7 @@ restrictions of other proprietary libraries that do not normally
|
|||||||
accompany the operating system. Such a contradiction means you
|
accompany the operating system. Such a contradiction means you
|
||||||
cannot use both them and the Library together in an executable
|
cannot use both them and the Library together in an executable
|
||||||
that you distribute.
|
that you distribute.
|
||||||
|
|
||||||
7. You may place library facilities that are a work based on the
|
7. You may place library facilities that are a work based on the
|
||||||
Library side-by-side in a single library together with other
|
Library side-by-side in a single library together with other
|
||||||
library facilities not covered by this License, and distribute
|
library facilities not covered by this License, and distribute
|
||||||
@@ -376,7 +376,7 @@ modify the Library subject to these terms and conditions. You
|
|||||||
may not impose any further restrictions on the recipients'
|
may not impose any further restrictions on the recipients'
|
||||||
exercise of the rights granted herein. You are not responsible
|
exercise of the rights granted herein. You are not responsible
|
||||||
for enforcing compliance by third parties to this License.
|
for enforcing compliance by third parties to this License.
|
||||||
|
|
||||||
11. If, as a consequence of a court judgment or allegation of
|
11. If, as a consequence of a court judgment or allegation of
|
||||||
patent infringement or for any other reason (not limited to
|
patent infringement or for any other reason (not limited to
|
||||||
patent issues), conditions are imposed on you (whether by court
|
patent issues), conditions are imposed on you (whether by court
|
||||||
|
@@ -8,12 +8,12 @@
|
|||||||
|
|
||||||
WXWINDOWS LIBRARY LICENCE
|
WXWINDOWS LIBRARY LICENCE
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or modify it
|
This library is free software; you can redistribute it and/or modify it
|
||||||
under the terms of the GNU Library General Public Licence as published by
|
under the terms of the GNU Library General Public Licence as published by
|
||||||
the Free Software Foundation; either version 2 of the Licence, or (at
|
the Free Software Foundation; either version 2 of the Licence, or (at
|
||||||
your option) any later version.
|
your option) any later version.
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful, but
|
This library is distributed in the hope that it will be useful, but
|
||||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
accordingly.
|
accordingly.
|
||||||
|
|
||||||
4. If you write modifications of your own for this library, it is your
|
4. If you write modifications of your own for this library, it is your
|
||||||
choice whether to permit this exception to apply to your modifications.
|
choice whether to permit this exception to apply to your modifications.
|
||||||
If you do not wish that, you must delete the exception notice from such
|
If you do not wish that, you must delete the exception notice from such
|
||||||
code and/or adjust the licensing conditions notice accordingly.
|
code and/or adjust the licensing conditions notice accordingly.
|
||||||
|
|
||||||
|
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
of this licence document, but changing it is not allowed.
|
of this licence document, but changing it is not allowed.
|
||||||
|
|
||||||
WXWINDOWS FREE DOCUMENTATION LICENCE
|
WXWINDOWS FREE DOCUMENTATION LICENCE
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
WARRANTY DISCLAIMER
|
WARRANTY DISCLAIMER
|
||||||
|
|
||||||
5. BECAUSE THIS MANUAL OR PIECE OF DOCUMENTATION IS LICENSED FREE OF CHARGE,
|
5. BECAUSE THIS MANUAL OR PIECE OF DOCUMENTATION IS LICENSED FREE OF CHARGE,
|
||||||
THERE IS NO WARRANTY FOR IT, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
THERE IS NO WARRANTY FOR IT, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||||
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER
|
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER
|
||||||
PARTIES PROVIDE THIS MANUAL OR PIECE OF DOCUMENTATION "AS IS" WITHOUT
|
PARTIES PROVIDE THIS MANUAL OR PIECE OF DOCUMENTATION "AS IS" WITHOUT
|
||||||
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
|
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
|
||||||
|
@@ -170,7 +170,7 @@ class, container classes, as well as classes for threading,
|
|||||||
networking, XML parsing, path and configuration management, logging,
|
networking, XML parsing, path and configuration management, logging,
|
||||||
debugging etc. These functions and classes have been separated into
|
debugging etc. These functions and classes have been separated into
|
||||||
their own library both for being able to write non-GUI apps as well
|
their own library both for being able to write non-GUI apps as well
|
||||||
as to make maintainance easier through reduced interdependence.
|
as to make maintainance easier through reduced interdependence.
|
||||||
</P>
|
</P>
|
||||||
<P ALIGN=JUSTIFY>Many of the changes to wxString and the container
|
<P ALIGN=JUSTIFY>Many of the changes to wxString and the container
|
||||||
classes are located in wxBase, but on top of that support to wxBase
|
classes are located in wxBase, but on top of that support to wxBase
|
||||||
@@ -186,7 +186,7 @@ change. Rather, this paragraph summarizes the most relevant changes
|
|||||||
to the GUI classes of wxWidgets. Given wxWidgets' nature as a GUI
|
to the GUI classes of wxWidgets. Given wxWidgets' nature as a GUI
|
||||||
library, these changes are also most likely to be visible to the user
|
library, these changes are also most likely to be visible to the user
|
||||||
and may thus be the most important changes from a user's perspective
|
and may thus be the most important changes from a user's perspective
|
||||||
(although not necessarily from a developer's perspective):
|
(although not necessarily from a developer's perspective):
|
||||||
</P>
|
</P>
|
||||||
<UL>
|
<UL>
|
||||||
<LI><P ALIGN=JUSTIFY>wxDataViewCtrl and wxDataViewTreeCtrl: this
|
<LI><P ALIGN=JUSTIFY>wxDataViewCtrl and wxDataViewTreeCtrl: this
|
||||||
@@ -310,7 +310,7 @@ cases, supporting an old version of GTK+ hinders development so we
|
|||||||
decided to declare GTK+ 2.6 the minimum toolkit version that is
|
decided to declare GTK+ 2.6 the minimum toolkit version that is
|
||||||
supported. As an example, this made it possible to always use the
|
supported. As an example, this made it possible to always use the
|
||||||
GTK+ file dialog instead of the old generic file dialog which had to
|
GTK+ file dialog instead of the old generic file dialog which had to
|
||||||
be used when GTK+ didn't have a usable file dialog.
|
be used when GTK+ didn't have a usable file dialog.
|
||||||
</P>
|
</P>
|
||||||
<P ALIGN=JUSTIFY STYLE="margin-bottom: 0cm">Other parts of wxGTK that
|
<P ALIGN=JUSTIFY STYLE="margin-bottom: 0cm">Other parts of wxGTK that
|
||||||
were rewritten or which underwent a major update include, but are not
|
were rewritten or which underwent a major update include, but are not
|
||||||
|
@@ -73,7 +73,7 @@ maybe stripped down to
|
|||||||
"Specialization is for insects."
|
"Specialization is for insects."
|
||||||
|
|
||||||
============================
|
============================
|
||||||
The Open-Source, Cross-Platform GUI Framework
|
The Open-Source, Cross-Platform GUI Framework
|
||||||
with Ten Years of Evolution Behind It
|
with Ten Years of Evolution Behind It
|
||||||
|
|
||||||
I saw this changed to 'native UI' on the website, which is slightly more
|
I saw this changed to 'native UI' on the website, which is slightly more
|
||||||
@@ -81,17 +81,17 @@ accurate but sounds less 'catchy' imho.
|
|||||||
|
|
||||||
.. and templates.
|
.. and templates.
|
||||||
|
|
||||||
Hmm. I might buy a mug that had, say, a wxLogo and "wxWidgets" (and
|
Hmm. I might buy a mug that had, say, a wxLogo and "wxWidgets" (and
|
||||||
maybe the website URL underneath in smaller type) on one side and
|
maybe the website URL underneath in smaller type) on one side and
|
||||||
"Specialization is for insects ... and templates" on the other.
|
"Specialization is for insects ... and templates" on the other.
|
||||||
|
|
||||||
.. only if it held at leat a full half (imperial) pint, mind. Not
|
.. only if it held at leat a full half (imperial) pint, mind. Not
|
||||||
one of those wussy 8.5 fl.oz. jobbies.
|
one of those wussy 8.5 fl.oz. jobbies.
|
||||||
|
|
||||||
That'd be a nice ice-breaker when working at a new client's site -
|
That'd be a nice ice-breaker when working at a new client's site -
|
||||||
people would be bound to stop and ask what it was all about!
|
people would be bound to stop and ask what it was all about!
|
||||||
|
|
||||||
.. and how about a nice silk tie (US: necktie) with the logo on ...
|
.. and how about a nice silk tie (US: necktie) with the logo on ...
|
||||||
Oh, I forgot, we programmers don't wear ties.
|
Oh, I forgot, we programmers don't wear ties.
|
||||||
|
|
||||||
============================
|
============================
|
||||||
@@ -149,7 +149,7 @@ One API to bridge them all and in the compiler bind them.
|
|||||||
|
|
||||||
wxWidgets
|
wxWidgets
|
||||||
|
|
||||||
How about "and in the linker bind them"? That's where the local libraries
|
How about "and in the linker bind them"? That's where the local libraries
|
||||||
get bound to the wxWidgets code anyway.
|
get bound to the wxWidgets code anyway.
|
||||||
|
|
||||||
============================
|
============================
|
||||||
@@ -162,7 +162,7 @@ Hugh Gibson wrote:
|
|||||||
> window control in different operating systems to emphasise the
|
> window control in different operating systems to emphasise the
|
||||||
> native look and feel.
|
> native look and feel.
|
||||||
|
|
||||||
Nice idea. But I wonder where you'll find some volunteer willing to
|
Nice idea. But I wonder where you'll find some volunteer willing to
|
||||||
have his face tattooed with win32 common controls ;-)
|
have his face tattooed with win32 common controls ;-)
|
||||||
|
|
||||||
============================
|
============================
|
||||||
|
@@ -7,7 +7,7 @@ The compilation was tested with
|
|||||||
-Compaq C++ 6.2
|
-Compaq C++ 6.2
|
||||||
-DECWindows 1.2-5
|
-DECWindows 1.2-5
|
||||||
-GTK1.2.8 (for wxGTK)
|
-GTK1.2.8 (for wxGTK)
|
||||||
|
|
||||||
To get everything compiled you'll need to have installed prior to compiling
|
To get everything compiled you'll need to have installed prior to compiling
|
||||||
wxWidgets:
|
wxWidgets:
|
||||||
-Bison
|
-Bison
|
||||||
@@ -19,7 +19,7 @@ wxWidgets:
|
|||||||
#define alloca malloc
|
#define alloca malloc
|
||||||
before
|
before
|
||||||
#endif /* __hpux */
|
#endif /* __hpux */
|
||||||
|
|
||||||
-Flex
|
-Flex
|
||||||
get it from http://www.openvms.digital.com/freeware/
|
get it from http://www.openvms.digital.com/freeware/
|
||||||
|
|
||||||
@@ -119,7 +119,7 @@ $ ass $disk2:[joukj.public.gtk.gtk.glib],-
|
|||||||
|
|
||||||
-I think in general wxGTK is better maintained, so that version is my
|
-I think in general wxGTK is better maintained, so that version is my
|
||||||
first choice.
|
first choice.
|
||||||
|
|
||||||
-Note that only a few people have used wxWidgets on VMS so many problems are
|
-Note that only a few people have used wxWidgets on VMS so many problems are
|
||||||
to be expected.
|
to be expected.
|
||||||
|
|
||||||
@@ -147,7 +147,7 @@ $ ass $disk2:[joukj.public.gtk.gtk.glib],-
|
|||||||
again.
|
again.
|
||||||
-image sample: after clicking "about" the colourmap is permanently
|
-image sample: after clicking "about" the colourmap is permanently
|
||||||
changed resulting in strange images
|
changed resulting in strange images
|
||||||
|
|
||||||
Finally :
|
Finally :
|
||||||
I like the idea of Robert Roebling that CD's with classical music should be
|
I like the idea of Robert Roebling that CD's with classical music should be
|
||||||
send to the authors.
|
send to the authors.
|
||||||
@@ -156,7 +156,7 @@ send to the authors.
|
|||||||
>-----------------------------------------------------------------------------<
|
>-----------------------------------------------------------------------------<
|
||||||
|
|
||||||
Jouk Jansen
|
Jouk Jansen
|
||||||
|
|
||||||
joukj@hrem.stm.tudelft.nl
|
joukj@hrem.stm.tudelft.nl
|
||||||
|
|
||||||
|
|
||||||
|
@@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based
|
|||||||
on the Library (independent of the use of the Library in a tool for
|
on the Library (independent of the use of the Library in a tool for
|
||||||
writing it). Whether that is true depends on what the Library does
|
writing it). Whether that is true depends on what the Library does
|
||||||
and what the program that uses the Library does.
|
and what the program that uses the Library does.
|
||||||
|
|
||||||
1. You may copy and distribute verbatim copies of the Library's
|
1. You may copy and distribute verbatim copies of the Library's
|
||||||
complete source code as you receive it, in any medium, provided that
|
complete source code as you receive it, in any medium, provided that
|
||||||
you conspicuously and appropriately publish on each copy an
|
you conspicuously and appropriately publish on each copy an
|
||||||
|
@@ -9,4 +9,4 @@ for wxWINE is in place and that all that has to be done to get
|
|||||||
wxWINE running is to make WINE work as Win32. No joke intended.
|
wxWINE running is to make WINE work as Win32. No joke intended.
|
||||||
|
|
||||||
Robert Roebling
|
Robert Roebling
|
||||||
|
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
* The most simple case
|
* The most simple case
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
If you compile wxWidgets on Linux for the first time and don't like to read
|
If you compile wxWidgets on Linux for the first time and don't like to read
|
||||||
install instructions just do (in the base dir):
|
install instructions just do (in the base dir):
|
||||||
|
|
||||||
> ./configure --with-wine
|
> ./configure --with-wine
|
||||||
@@ -12,8 +12,8 @@ install instructions just do (in the base dir):
|
|||||||
> ldconfig
|
> ldconfig
|
||||||
> exit
|
> exit
|
||||||
|
|
||||||
On all variants of Unix except Linux (and maybe except *BSD), shared libraries
|
On all variants of Unix except Linux (and maybe except *BSD), shared libraries
|
||||||
are not supported out of the box due to the utter stupidity of libtool, so you'll
|
are not supported out of the box due to the utter stupidity of libtool, so you'll
|
||||||
have to do this to get shared library support:
|
have to do this to get shared library support:
|
||||||
|
|
||||||
> ./configure --with-wine --disable-unicode --disable-static --enable-shared
|
> ./configure --with-wine --disable-unicode --disable-static --enable-shared
|
||||||
@@ -23,12 +23,12 @@ important entries with respect to shared library creation, which are
|
|||||||
|
|
||||||
archive_cmds="\$LD -shared ....
|
archive_cmds="\$LD -shared ....
|
||||||
archive_expsym_cmds="\$LD -shared ....
|
archive_expsym_cmds="\$LD -shared ....
|
||||||
|
|
||||||
which should be something like
|
which should be something like
|
||||||
|
|
||||||
archive_cmds="\$CC -shared ....
|
archive_cmds="\$CC -shared ....
|
||||||
archive_expsym_cmds="\$CC -shared ....
|
archive_expsym_cmds="\$CC -shared ....
|
||||||
|
|
||||||
Afterwards you can continue with
|
Afterwards you can continue with
|
||||||
|
|
||||||
> make
|
> make
|
||||||
@@ -47,14 +47,14 @@ If you want to remove wxWidgets on Unix you can do this:
|
|||||||
* The expert case
|
* The expert case
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
If you want to do some more serious cross-platform programming with wxWidgets,
|
If you want to do some more serious cross-platform programming with wxWidgets,
|
||||||
such as for GTK and Motif, you can now build two complete libraries and use
|
such as for GTK and Motif, you can now build two complete libraries and use
|
||||||
them concurrently. For this end, you have to create a directory for each build
|
them concurrently. For this end, you have to create a directory for each build
|
||||||
of wxWidgets - you may also want to create different versions of wxWidgets
|
of wxWidgets - you may also want to create different versions of wxWidgets
|
||||||
and test them concurrently. Most typically, this would be a version configured
|
and test them concurrently. Most typically, this would be a version configured
|
||||||
with --enable-debug_flag and one without. Note, that only one build can currently
|
with --enable-debug_flag and one without. Note, that only one build can currently
|
||||||
be installed, so you'd have to use local version of the library for that purpose.
|
be installed, so you'd have to use local version of the library for that purpose.
|
||||||
For building three versions (one GTK, one WINE and a debug version of the WINE
|
For building three versions (one GTK, one WINE and a debug version of the WINE
|
||||||
source) you'd do this:
|
source) you'd do this:
|
||||||
|
|
||||||
md buildmotif
|
md buildmotif
|
||||||
@@ -78,18 +78,18 @@ cd ..
|
|||||||
* The most simple errors
|
* The most simple errors
|
||||||
------------------------
|
------------------------
|
||||||
|
|
||||||
wxWINE doesn't work yet as WINE isn't really up to the task yet.
|
wxWINE doesn't work yet as WINE isn't really up to the task yet.
|
||||||
|
|
||||||
You get errors during compilation: The reason is that you probably have a broken
|
You get errors during compilation: The reason is that you probably have a broken
|
||||||
compiler, which includes almost everything that is called gcc. If you use gcc 2.8
|
compiler, which includes almost everything that is called gcc. If you use gcc 2.8
|
||||||
you have to disable optimisation as the compiler will give up with an internal
|
you have to disable optimisation as the compiler will give up with an internal
|
||||||
compiler error.
|
compiler error.
|
||||||
|
|
||||||
If there is just any way for you to use egcs, use egcs. We cannot fix gcc.
|
If there is just any way for you to use egcs, use egcs. We cannot fix gcc.
|
||||||
|
|
||||||
You get immediate segfault when starting any sample or application: This is either
|
You get immediate segfault when starting any sample or application: This is either
|
||||||
due to having compiled the library with different flags or options than your program -
|
due to having compiled the library with different flags or options than your program -
|
||||||
typically you might have the __WXDEBUG__ option set for the library but not for your
|
typically you might have the __WXDEBUG__ option set for the library but not for your
|
||||||
program - or due to using a broken compiler (and its optimisation) such as GCC 2.8.
|
program - or due to using a broken compiler (and its optimisation) such as GCC 2.8.
|
||||||
|
|
||||||
* The most simple program
|
* The most simple program
|
||||||
@@ -102,27 +102,27 @@ g++ myfoo.cpp `wx-config --libs --cflags` -o myfoo
|
|||||||
* General
|
* General
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
The Unix variants of wxWidgets use GNU configure. If you have problems with your
|
The Unix variants of wxWidgets use GNU configure. If you have problems with your
|
||||||
make use GNU make instead.
|
make use GNU make instead.
|
||||||
|
|
||||||
If you have general problems with installation, read my homepage at
|
If you have general problems with installation, read my homepage at
|
||||||
|
|
||||||
http://wesley.informatik.uni-freiburg.de/~wxxt
|
http://wesley.informatik.uni-freiburg.de/~wxxt
|
||||||
|
|
||||||
for newest information. If you still don't have any success, please send a bug
|
for newest information. If you still don't have any success, please send a bug
|
||||||
report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF
|
report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF
|
||||||
YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF WINE, WXWINE, WHAT DISTRIBUTION
|
YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF WINE, WXWINE, WHAT DISTRIBUTION
|
||||||
YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried...
|
YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried...
|
||||||
|
|
||||||
* GUI libraries
|
* GUI libraries
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
wxWidgets/WINE requires the WINE library to be installed on your system.
|
wxWidgets/WINE requires the WINE library to be installed on your system.
|
||||||
|
|
||||||
You can get the newest version of the WINE from the WINE homepage at:
|
You can get the newest version of the WINE from the WINE homepage at:
|
||||||
|
|
||||||
http://www.winehq.com
|
http://www.winehq.com
|
||||||
|
|
||||||
* Create your configuration
|
* Create your configuration
|
||||||
-----------------------------
|
-----------------------------
|
||||||
|
|
||||||
@@ -141,16 +141,16 @@ to see all the options please use:
|
|||||||
./configure --help
|
./configure --help
|
||||||
|
|
||||||
The basic philosophy is that if you want to use different
|
The basic philosophy is that if you want to use different
|
||||||
configurations, like a debug and a release version,
|
configurations, like a debug and a release version,
|
||||||
or use the same source tree on different systems,
|
or use the same source tree on different systems,
|
||||||
you have only to change the environment variable OSTYPE.
|
you have only to change the environment variable OSTYPE.
|
||||||
(Sadly this variable is not set by default on some systems
|
(Sadly this variable is not set by default on some systems
|
||||||
in some shells - on SGI's for example). So you will have to
|
in some shells - on SGI's for example). So you will have to
|
||||||
set it there. This variable HAS to be set before starting
|
set it there. This variable HAS to be set before starting
|
||||||
configure, so that it knows which system it tries to
|
configure, so that it knows which system it tries to
|
||||||
configure for.
|
configure for.
|
||||||
|
|
||||||
Configure will complain if the system variable OSTYPE has
|
Configure will complain if the system variable OSTYPE has
|
||||||
not been defined. And Make in some circumstances as well...
|
not been defined. And Make in some circumstances as well...
|
||||||
|
|
||||||
|
|
||||||
@@ -167,7 +167,7 @@ in wxWidgets snapshot 6, but not yet all (ODBC not).
|
|||||||
You must do this by running configure with either of:
|
You must do this by running configure with either of:
|
||||||
|
|
||||||
--with-wine Use the WINE library
|
--with-wine Use the WINE library
|
||||||
|
|
||||||
The following options handle the kind of library you want to build.
|
The following options handle the kind of library you want to build.
|
||||||
|
|
||||||
--enable-threads Compile with thread support. Threads
|
--enable-threads Compile with thread support. Threads
|
||||||
@@ -182,25 +182,25 @@ The following options handle the kind of library you want to build.
|
|||||||
such as Sun with gcc 2.8.X which
|
such as Sun with gcc 2.8.X which
|
||||||
would otherwise produce segvs.
|
would otherwise produce segvs.
|
||||||
|
|
||||||
--enable-profile Add profiling info to the object
|
--enable-profile Add profiling info to the object
|
||||||
files. Currently broken, I think.
|
files. Currently broken, I think.
|
||||||
|
|
||||||
--enable-no_rtti Enable compilation without creation of
|
--enable-no_rtti Enable compilation without creation of
|
||||||
C++ RTTI information in object files.
|
C++ RTTI information in object files.
|
||||||
This will speed-up compilation and reduce
|
This will speed-up compilation and reduce
|
||||||
binary size.
|
binary size.
|
||||||
|
|
||||||
--enable-no_exceptions Enable compilation without creation of
|
--enable-no_exceptions Enable compilation without creation of
|
||||||
C++ exception information in object files.
|
C++ exception information in object files.
|
||||||
This will speed-up compilation and reduce
|
This will speed-up compilation and reduce
|
||||||
binary size. Also fewer crashes during the
|
binary size. Also fewer crashes during the
|
||||||
actual compilation...
|
actual compilation...
|
||||||
|
|
||||||
--enable-mem_tracing Add built-in memory tracing.
|
--enable-mem_tracing Add built-in memory tracing.
|
||||||
|
|
||||||
--enable-dmalloc Use the dmalloc memory debugger.
|
--enable-dmalloc Use the dmalloc memory debugger.
|
||||||
Read more at www.letters.com/dmalloc/
|
Read more at www.letters.com/dmalloc/
|
||||||
|
|
||||||
--enable-debug_info Add debug info to object files and
|
--enable-debug_info Add debug info to object files and
|
||||||
executables for use with debuggers
|
executables for use with debuggers
|
||||||
such as gdb (or its many frontends).
|
such as gdb (or its many frontends).
|
||||||
@@ -210,7 +210,7 @@ The following options handle the kind of library you want to build.
|
|||||||
useful internal debugging tricks (such
|
useful internal debugging tricks (such
|
||||||
as automatically reporting illegal calls)
|
as automatically reporting illegal calls)
|
||||||
to work. Note that program and library
|
to work. Note that program and library
|
||||||
must be compiled with the same debug
|
must be compiled with the same debug
|
||||||
options.
|
options.
|
||||||
|
|
||||||
* Feature Options
|
* Feature Options
|
||||||
@@ -221,42 +221,42 @@ in wxWidgets snapshot 6, but not yet all (ODBC not).
|
|||||||
|
|
||||||
When producing an executable that is linked statically with wxGTK
|
When producing an executable that is linked statically with wxGTK
|
||||||
you'll be surprised at its immense size. This can sometimes be
|
you'll be surprised at its immense size. This can sometimes be
|
||||||
drastically reduced by removing features from wxWidgets that
|
drastically reduced by removing features from wxWidgets that
|
||||||
are not used in your program. The most relevant such features
|
are not used in your program. The most relevant such features
|
||||||
are
|
are
|
||||||
|
|
||||||
--without-libpng Disables PNG image format code.
|
--without-libpng Disables PNG image format code.
|
||||||
|
|
||||||
--without-libjpeg Disables JPEG image format code.
|
--without-libjpeg Disables JPEG image format code.
|
||||||
|
|
||||||
{ --without-odbc Disables ODBC code. Not yet. }
|
{ --without-odbc Disables ODBC code. Not yet. }
|
||||||
|
|
||||||
--disable-resources Disables the use of *.wxr type
|
--disable-resources Disables the use of *.wxr type
|
||||||
resources.
|
resources.
|
||||||
|
|
||||||
--disable-threads Disables threads. Will also
|
--disable-threads Disables threads. Will also
|
||||||
disable sockets.
|
disable sockets.
|
||||||
|
|
||||||
--disable-sockets Disables sockets.
|
--disable-sockets Disables sockets.
|
||||||
|
|
||||||
--disable-dnd Disables Drag'n'Drop.
|
--disable-dnd Disables Drag'n'Drop.
|
||||||
|
|
||||||
--disable-clipboard Disables Clipboard.
|
--disable-clipboard Disables Clipboard.
|
||||||
|
|
||||||
--disable-serial Disables object instance serialisation.
|
--disable-serial Disables object instance serialisation.
|
||||||
|
|
||||||
--disable-streams Disables the wxStream classes.
|
--disable-streams Disables the wxStream classes.
|
||||||
|
|
||||||
--disable-file Disables the wxFile class.
|
--disable-file Disables the wxFile class.
|
||||||
|
|
||||||
--disable-textfile Disables the wxTextFile class.
|
--disable-textfile Disables the wxTextFile class.
|
||||||
|
|
||||||
--disable-intl Disables the internationalisation.
|
--disable-intl Disables the internationalisation.
|
||||||
|
|
||||||
--disable-validators Disables validators.
|
--disable-validators Disables validators.
|
||||||
|
|
||||||
--disable-accel Disables accel.
|
--disable-accel Disables accel.
|
||||||
|
|
||||||
Apart from disabling certain features you can very often "strip"
|
Apart from disabling certain features you can very often "strip"
|
||||||
the program of its debugging information resulting in a significant
|
the program of its debugging information resulting in a significant
|
||||||
reduction in size.
|
reduction in size.
|
||||||
@@ -267,13 +267,13 @@ reduction in size.
|
|||||||
The following must be done in the base directory (e.g. ~/wxGTK
|
The following must be done in the base directory (e.g. ~/wxGTK
|
||||||
or ~/wxWin or whatever)
|
or ~/wxWin or whatever)
|
||||||
|
|
||||||
Now the makefiles are created (by configure) and you can compile
|
Now the makefiles are created (by configure) and you can compile
|
||||||
the library by typing:
|
the library by typing:
|
||||||
|
|
||||||
make
|
make
|
||||||
|
|
||||||
make yourself some coffee, as it will take some time. On an old
|
make yourself some coffee, as it will take some time. On an old
|
||||||
386SX possibly two weeks. During compilation, you'll get a few
|
386SX possibly two weeks. During compilation, you'll get a few
|
||||||
warning messages depending in your compiler.
|
warning messages depending in your compiler.
|
||||||
|
|
||||||
If you want to be more selective, you can change into a specific
|
If you want to be more selective, you can change into a specific
|
||||||
@@ -284,12 +284,12 @@ Then you may install the library and its header files under
|
|||||||
have to log in as root (i.e. run "su" and enter the root
|
have to log in as root (i.e. run "su" and enter the root
|
||||||
password) and type
|
password) and type
|
||||||
|
|
||||||
make install
|
make install
|
||||||
|
|
||||||
You can remove any traces of wxWidgets by typing
|
You can remove any traces of wxWidgets by typing
|
||||||
|
|
||||||
make uninstall
|
make uninstall
|
||||||
|
|
||||||
If you want to save disk space by removing unnecessary
|
If you want to save disk space by removing unnecessary
|
||||||
object-files:
|
object-files:
|
||||||
|
|
||||||
@@ -316,13 +316,13 @@ minimal: minimal.o
|
|||||||
minimal.o: minimal.cpp
|
minimal.o: minimal.cpp
|
||||||
$(CXX) `wx-config --cflags` -c minimal.cpp -o minimal.o
|
$(CXX) `wx-config --cflags` -c minimal.cpp -o minimal.o
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o minimal
|
rm -f *.o minimal
|
||||||
|
|
||||||
This is certain to become the standard way unless we decide
|
This is certain to become the standard way unless we decide
|
||||||
to stick to tmake.
|
to stick to tmake.
|
||||||
|
|
||||||
2) The other way creates a project within the source code
|
2) The other way creates a project within the source code
|
||||||
directories of wxWidgets. For this endeavour, you'll need
|
directories of wxWidgets. For this endeavour, you'll need
|
||||||
the usual number of GNU tools, at least
|
the usual number of GNU tools, at least
|
||||||
|
|
||||||
@@ -331,7 +331,7 @@ GNU autoheader version 2.14
|
|||||||
GNU autoconf version 2.14
|
GNU autoconf version 2.14
|
||||||
GNU libtool version 1.3
|
GNU libtool version 1.3
|
||||||
|
|
||||||
and quite possibly
|
and quite possibly
|
||||||
|
|
||||||
GNU make
|
GNU make
|
||||||
GNU C++
|
GNU C++
|
||||||
@@ -344,10 +344,10 @@ go ahead yourself :-)
|
|||||||
In the hope that it will be useful,
|
In the hope that it will be useful,
|
||||||
|
|
||||||
Robert Roebling <roebling@sun2.ruf.uni-freiburg.de>
|
Robert Roebling <roebling@sun2.ruf.uni-freiburg.de>
|
||||||
|
|
||||||
|
|
||||||
Addition notes by Julian Smart, August 2002
|
Addition notes by Julian Smart, August 2002
|
||||||
===========================================
|
===========================================
|
||||||
|
|
||||||
I've fixed some compile errors, and got as far as
|
I've fixed some compile errors, and got as far as
|
||||||
compiling wxWINE, but actually linking a sample will take
|
compiling wxWINE, but actually linking a sample will take
|
||||||
|
@@ -9,15 +9,15 @@ install.txt.
|
|||||||
When you run into problems, please read the install.txt and
|
When you run into problems, please read the install.txt and
|
||||||
follow those instructions. If you still don't have any success,
|
follow those instructions. If you still don't have any success,
|
||||||
please send a bug report to one of our mailing lists (see
|
please send a bug report to one of our mailing lists (see
|
||||||
my homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND
|
my homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND
|
||||||
YOUR PROBLEM, SUCH AS YOUR VERSION OF THE WINE SOURCES, WHAT
|
YOUR PROBLEM, SUCH AS YOUR VERSION OF THE WINE SOURCES, WHAT
|
||||||
DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED.
|
DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED.
|
||||||
|
|
||||||
Please send problems concerning installation, feature requests,
|
Please send problems concerning installation, feature requests,
|
||||||
bug reports or comments to the wxWidgets users list. Information
|
bug reports or comments to the wxWidgets users list. Information
|
||||||
on how to subscribe is available from my homepage.
|
on how to subscribe is available from my homepage.
|
||||||
|
|
||||||
wxWidgets/Wine doesn't come with any guarantee whatsoever. It might
|
wxWidgets/Wine doesn't come with any guarantee whatsoever. It might
|
||||||
crash your harddisk or destroy your monitor. It doesn't claim to be
|
crash your harddisk or destroy your monitor. It doesn't claim to be
|
||||||
suitable for any special or general purpose.
|
suitable for any special or general purpose.
|
||||||
|
|
||||||
|
@@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
|
|||||||
|
|
||||||
All Rights Reserved
|
All Rights Reserved
|
||||||
|
|
||||||
Permission to use, copy, modify, and distribute this software and its
|
Permission to use, copy, modify, and distribute this software and its
|
||||||
documentation for any purpose and without fee is hereby granted,
|
documentation for any purpose and without fee is hereby granted,
|
||||||
provided that the above copyright notice appear in all copies and that
|
provided that the above copyright notice appear in all copies and that
|
||||||
both that copyright notice and this permission notice appear in
|
both that copyright notice and this permission notice appear in
|
||||||
supporting documentation, and that the name of Digital not be
|
supporting documentation, and that the name of Digital not be
|
||||||
used in advertising or publicity pertaining to distribution of the
|
used in advertising or publicity pertaining to distribution of the
|
||||||
software without specific, written prior permission.
|
software without specific, written prior permission.
|
||||||
|
|
||||||
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
|
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
|
||||||
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
|
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
|
||||||
|
@@ -160,7 +160,7 @@
|
|||||||
#pragma comment(lib, wxBASE_LIB_NAME("net"))
|
#pragma comment(lib, wxBASE_LIB_NAME("net"))
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_XML && !defined(wxNO_XML_LIB)
|
#if wxUSE_XML && !defined(wxNO_XML_LIB)
|
||||||
#pragma comment(lib, wxBASE_LIB_NAME("xml"))
|
#pragma comment(lib, wxBASE_LIB_NAME("xml"))
|
||||||
#endif
|
#endif
|
||||||
#endif // defined(wxMONOLITHIC) && wxMONOLITHIC == 1
|
#endif // defined(wxMONOLITHIC) && wxMONOLITHIC == 1
|
||||||
|
|
||||||
@@ -204,7 +204,7 @@
|
|||||||
|
|
||||||
#if wxUSE_HTML && !defined(wxNO_HTML_LIB)
|
#if wxUSE_HTML && !defined(wxNO_HTML_LIB)
|
||||||
#pragma comment(lib, wxTOOLKIT_LIB_NAME("html"))
|
#pragma comment(lib, wxTOOLKIT_LIB_NAME("html"))
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB)
|
#if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB)
|
||||||
#pragma comment(lib, wxTOOLKIT_LIB_NAME("qa"))
|
#pragma comment(lib, wxTOOLKIT_LIB_NAME("qa"))
|
||||||
#endif
|
#endif
|
||||||
@@ -227,7 +227,7 @@
|
|||||||
#pragma comment(lib, wxTOOLKIT_LIB_NAME("media"))
|
#pragma comment(lib, wxTOOLKIT_LIB_NAME("media"))
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_STC && !defined(wxNO_STC_LIB)
|
#if wxUSE_STC && !defined(wxNO_STC_LIB)
|
||||||
#pragma comment(lib, wxTOOLKIT_LIB_NAME("stc"))
|
#pragma comment(lib, wxTOOLKIT_LIB_NAME("stc"))
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_WEBVIEW && !defined(wxNO_WEBVIEW_LIB)
|
#if wxUSE_WEBVIEW && !defined(wxNO_WEBVIEW_LIB)
|
||||||
#pragma comment(lib, wxTOOLKIT_LIB_NAME("webview"))
|
#pragma comment(lib, wxTOOLKIT_LIB_NAME("webview"))
|
||||||
|
@@ -33,7 +33,7 @@ enum wxAcceleratorEntryFlags
|
|||||||
wxACCEL_CTRL = 0x0002, // hold Ctrl key down
|
wxACCEL_CTRL = 0x0002, // hold Ctrl key down
|
||||||
wxACCEL_SHIFT = 0x0004, // hold Shift key down
|
wxACCEL_SHIFT = 0x0004, // hold Shift key down
|
||||||
#if defined(__WXMAC__)
|
#if defined(__WXMAC__)
|
||||||
wxACCEL_RAW_CTRL= 0x0008, //
|
wxACCEL_RAW_CTRL= 0x0008, //
|
||||||
#else
|
#else
|
||||||
wxACCEL_RAW_CTRL= wxACCEL_CTRL,
|
wxACCEL_RAW_CTRL= wxACCEL_CTRL,
|
||||||
#endif
|
#endif
|
||||||
|
@@ -104,7 +104,7 @@ public:
|
|||||||
|
|
||||||
// Called before the first events are handled, called from within MainLoop()
|
// Called before the first events are handled, called from within MainLoop()
|
||||||
virtual void OnLaunched();
|
virtual void OnLaunched();
|
||||||
|
|
||||||
// This is called by wxEventLoopBase::SetActive(): you should put the code
|
// This is called by wxEventLoopBase::SetActive(): you should put the code
|
||||||
// which needs an active event loop here.
|
// which needs an active event loop here.
|
||||||
// Note that this function is called whenever an event loop is activated;
|
// Note that this function is called whenever an event loop is activated;
|
||||||
|
@@ -350,7 +350,7 @@ public:
|
|||||||
|
|
||||||
virtual int ChangeSelection(size_t n) wxOVERRIDE;
|
virtual int ChangeSelection(size_t n) wxOVERRIDE;
|
||||||
|
|
||||||
virtual bool AddPage(wxWindow *page, const wxString &text, bool select,
|
virtual bool AddPage(wxWindow *page, const wxString &text, bool select,
|
||||||
int imageId) wxOVERRIDE;
|
int imageId) wxOVERRIDE;
|
||||||
virtual bool DeleteAllPages() wxOVERRIDE;
|
virtual bool DeleteAllPages() wxOVERRIDE;
|
||||||
virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text,
|
virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text,
|
||||||
|
@@ -118,7 +118,7 @@ public:
|
|||||||
virtual ChannelType Blue() const = 0;
|
virtual ChannelType Blue() const = 0;
|
||||||
virtual ChannelType Alpha() const
|
virtual ChannelType Alpha() const
|
||||||
{ return wxALPHA_OPAQUE ; }
|
{ return wxALPHA_OPAQUE ; }
|
||||||
|
|
||||||
virtual bool IsSolid() const
|
virtual bool IsSolid() const
|
||||||
{ return true; }
|
{ return true; }
|
||||||
|
|
||||||
|
@@ -345,11 +345,11 @@ public:
|
|||||||
virtual size_t GetLength() const { return m_html.Len() + 1; }
|
virtual size_t GetLength() const { return m_html.Len() + 1; }
|
||||||
virtual wxString GetHTML() const { return m_html; }
|
virtual wxString GetHTML() const { return m_html; }
|
||||||
virtual void SetHTML(const wxString& html) { m_html = html; }
|
virtual void SetHTML(const wxString& html) { m_html = html; }
|
||||||
|
|
||||||
virtual size_t GetDataSize() const wxOVERRIDE;
|
virtual size_t GetDataSize() const wxOVERRIDE;
|
||||||
virtual bool GetDataHere(void *buf) const wxOVERRIDE;
|
virtual bool GetDataHere(void *buf) const wxOVERRIDE;
|
||||||
virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
|
virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
|
||||||
|
|
||||||
// Must provide overloads to avoid hiding them (and warnings about it)
|
// Must provide overloads to avoid hiding them (and warnings about it)
|
||||||
virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE
|
virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE
|
||||||
{
|
{
|
||||||
|
@@ -283,7 +283,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
virtual void* GetHandle() const { return NULL; }
|
virtual void* GetHandle() const { return NULL; }
|
||||||
|
|
||||||
// query dimension, colour deps, resolution
|
// query dimension, colour deps, resolution
|
||||||
|
|
||||||
virtual void DoGetSize(int *width, int *height) const = 0;
|
virtual void DoGetSize(int *width, int *height) const = 0;
|
||||||
@@ -528,7 +528,7 @@ public:
|
|||||||
|
|
||||||
// this needs to overidden if the axis is inverted
|
// this needs to overidden if the axis is inverted
|
||||||
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
|
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
|
||||||
|
|
||||||
virtual double GetContentScaleFactor() const { return m_contentScaleFactor; }
|
virtual double GetContentScaleFactor() const { return m_contentScaleFactor; }
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
@@ -722,7 +722,7 @@ protected:
|
|||||||
double m_scaleX, m_scaleY; // calculated from logical scale and user scale
|
double m_scaleX, m_scaleY; // calculated from logical scale and user scale
|
||||||
|
|
||||||
int m_signX, m_signY; // Used by SetAxisOrientation() to invert the axes
|
int m_signX, m_signY; // Used by SetAxisOrientation() to invert the axes
|
||||||
|
|
||||||
double m_contentScaleFactor; // used by high resolution displays (retina)
|
double m_contentScaleFactor; // used by high resolution displays (retina)
|
||||||
|
|
||||||
// Pixel per mm in horizontal and vertical directions.
|
// Pixel per mm in horizontal and vertical directions.
|
||||||
|
@@ -134,7 +134,7 @@ private:
|
|||||||
int m_style;
|
int m_style;
|
||||||
|
|
||||||
wxSize m_area;
|
wxSize m_area;
|
||||||
|
|
||||||
wxDECLARE_DYNAMIC_CLASS(wxBufferedDC);
|
wxDECLARE_DYNAMIC_CLASS(wxBufferedDC);
|
||||||
wxDECLARE_NO_COPY_CLASS(wxBufferedDC);
|
wxDECLARE_NO_COPY_CLASS(wxBufferedDC);
|
||||||
};
|
};
|
||||||
|
@@ -32,7 +32,7 @@ public:
|
|||||||
wxGCDC( const wxEnhMetaFileDC& dc );
|
wxGCDC( const wxEnhMetaFileDC& dc );
|
||||||
#endif
|
#endif
|
||||||
wxGCDC(wxGraphicsContext* context);
|
wxGCDC(wxGraphicsContext* context);
|
||||||
|
|
||||||
wxGCDC();
|
wxGCDC();
|
||||||
virtual ~wxGCDC();
|
virtual ~wxGCDC();
|
||||||
|
|
||||||
|
@@ -129,7 +129,7 @@ public:
|
|||||||
#elif defined(__WXOSX__)
|
#elif defined(__WXOSX__)
|
||||||
public:
|
public:
|
||||||
wxNativeFontInfo(const wxNativeFontInfo& info) { Init(info); }
|
wxNativeFontInfo(const wxNativeFontInfo& info) { Init(info); }
|
||||||
|
|
||||||
~wxNativeFontInfo() { Free(); }
|
~wxNativeFontInfo() { Free(); }
|
||||||
|
|
||||||
wxNativeFontInfo& operator=(const wxNativeFontInfo& info)
|
wxNativeFontInfo& operator=(const wxNativeFontInfo& info)
|
||||||
@@ -147,7 +147,7 @@ public:
|
|||||||
void Init(const wxNativeFontInfo& info);
|
void Init(const wxNativeFontInfo& info);
|
||||||
|
|
||||||
void Free();
|
void Free();
|
||||||
|
|
||||||
wxString GetFamilyName() const;
|
wxString GetFamilyName() const;
|
||||||
wxString GetStyleName() const;
|
wxString GetStyleName() const;
|
||||||
|
|
||||||
@@ -157,8 +157,8 @@ public:
|
|||||||
static CGFloat GetCTWeight( CTFontRef font );
|
static CGFloat GetCTWeight( CTFontRef font );
|
||||||
static CGFloat GetCTWeight( CTFontDescriptorRef font );
|
static CGFloat GetCTWeight( CTFontDescriptorRef font );
|
||||||
static CGFloat GetCTSlant( CTFontDescriptorRef font );
|
static CGFloat GetCTSlant( CTFontDescriptorRef font );
|
||||||
|
|
||||||
|
|
||||||
CTFontDescriptorRef GetCTFontDescriptor() const;
|
CTFontDescriptorRef GetCTFontDescriptor() const;
|
||||||
private:
|
private:
|
||||||
// attributes for regenerating a CTFontDescriptor, stay close to native values
|
// attributes for regenerating a CTFontDescriptor, stay close to native values
|
||||||
@@ -167,7 +167,7 @@ private:
|
|||||||
wxFontStyle m_style;
|
wxFontStyle m_style;
|
||||||
CGFloat m_ctSize;
|
CGFloat m_ctSize;
|
||||||
wxFontFamily m_family;
|
wxFontFamily m_family;
|
||||||
|
|
||||||
wxString m_styleName;
|
wxString m_styleName;
|
||||||
wxString m_familyName;
|
wxString m_familyName;
|
||||||
|
|
||||||
|
@@ -50,7 +50,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
virtual void DoSetCount(unsigned int count) wxOVERRIDE;
|
virtual void DoSetCount(unsigned int count) wxOVERRIDE;
|
||||||
|
@@ -35,7 +35,7 @@ enum wxInterpolationQuality
|
|||||||
// default interpolation
|
// default interpolation
|
||||||
wxINTERPOLATION_DEFAULT,
|
wxINTERPOLATION_DEFAULT,
|
||||||
// no interpolation
|
// no interpolation
|
||||||
wxINTERPOLATION_NONE,
|
wxINTERPOLATION_NONE,
|
||||||
// fast interpolation, suited for interactivity
|
// fast interpolation, suited for interactivity
|
||||||
wxINTERPOLATION_FAST,
|
wxINTERPOLATION_FAST,
|
||||||
// better quality
|
// better quality
|
||||||
@@ -206,7 +206,7 @@ public:
|
|||||||
#if wxUSE_IMAGE
|
#if wxUSE_IMAGE
|
||||||
wxImage ConvertToImage() const;
|
wxImage ConvertToImage() const;
|
||||||
#endif // wxUSE_IMAGE
|
#endif // wxUSE_IMAGE
|
||||||
|
|
||||||
void* GetNativeBitmap() const;
|
void* GetNativeBitmap() const;
|
||||||
|
|
||||||
const wxGraphicsBitmapData* GetBitmapData() const
|
const wxGraphicsBitmapData* GetBitmapData() const
|
||||||
@@ -601,10 +601,10 @@ public:
|
|||||||
|
|
||||||
// returns the current interpolation quality
|
// returns the current interpolation quality
|
||||||
virtual wxInterpolationQuality GetInterpolationQuality() const { return m_interpolation; }
|
virtual wxInterpolationQuality GetInterpolationQuality() const { return m_interpolation; }
|
||||||
|
|
||||||
// sets the interpolation quality, returns true if it supported
|
// sets the interpolation quality, returns true if it supported
|
||||||
virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) = 0;
|
virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) = 0;
|
||||||
|
|
||||||
// returns the current compositing operator
|
// returns the current compositing operator
|
||||||
virtual wxCompositionMode GetCompositionMode() const { return m_composition; }
|
virtual wxCompositionMode GetCompositionMode() const { return m_composition; }
|
||||||
|
|
||||||
@@ -754,14 +754,14 @@ public:
|
|||||||
|
|
||||||
// helper to determine if a 0.5 offset should be applied for the drawing operation
|
// helper to determine if a 0.5 offset should be applied for the drawing operation
|
||||||
virtual bool ShouldOffset() const { return false; }
|
virtual bool ShouldOffset() const { return false; }
|
||||||
|
|
||||||
// indicates whether the context should try to offset for pixel boundaries, this only makes sense on
|
// indicates whether the context should try to offset for pixel boundaries, this only makes sense on
|
||||||
// bitmap devices like screen, by default this is turned off
|
// bitmap devices like screen, by default this is turned off
|
||||||
virtual void EnableOffset(bool enable = true);
|
virtual void EnableOffset(bool enable = true);
|
||||||
|
|
||||||
void DisableOffset() { EnableOffset(false); }
|
void DisableOffset() { EnableOffset(false); }
|
||||||
bool OffsetEnabled() { return m_enableOffset; }
|
bool OffsetEnabled() { return m_enableOffset; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// These fields must be initialized in the derived class ctors.
|
// These fields must be initialized in the derived class ctors.
|
||||||
wxDouble m_width,
|
wxDouble m_width,
|
||||||
|
@@ -136,7 +136,7 @@ public:
|
|||||||
|
|
||||||
virtual GdkWindow* GetGDKWindow() const { return NULL; }
|
virtual GdkWindow* GetGDKWindow() const { return NULL; }
|
||||||
virtual void* GetHandle() const wxOVERRIDE { return GetGDKWindow(); }
|
virtual void* GetHandle() const wxOVERRIDE { return GetGDKWindow(); }
|
||||||
|
|
||||||
// base class pure virtuals implemented here
|
// base class pure virtuals implemented here
|
||||||
virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
|
virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
|
||||||
virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
|
virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
|
||||||
|
@@ -39,7 +39,7 @@ public:
|
|||||||
virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
|
virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
|
||||||
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
|
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
|
||||||
virtual void* GetHandle() const wxOVERRIDE;
|
virtual void* GetHandle() const wxOVERRIDE;
|
||||||
|
|
||||||
// overridden for wxMemoryDC Impl
|
// overridden for wxMemoryDC Impl
|
||||||
virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE;
|
virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE;
|
||||||
|
|
||||||
|
@@ -226,7 +226,7 @@ public:
|
|||||||
|
|
||||||
virtual void* GetCairoContext() const wxOVERRIDE;
|
virtual void* GetCairoContext() const wxOVERRIDE;
|
||||||
virtual void* GetHandle() const wxOVERRIDE;
|
virtual void* GetHandle() const wxOVERRIDE;
|
||||||
|
|
||||||
bool CanDrawBitmap() const wxOVERRIDE { return true; }
|
bool CanDrawBitmap() const wxOVERRIDE { return true; }
|
||||||
void Clear() wxOVERRIDE;
|
void Clear() wxOVERRIDE;
|
||||||
void SetFont( const wxFont& font ) wxOVERRIDE;
|
void SetFont( const wxFont& font ) wxOVERRIDE;
|
||||||
|
@@ -46,7 +46,7 @@ class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxE
|
|||||||
public:
|
public:
|
||||||
wxHtmlHelpController(int style = wxHF_DEFAULT_STYLE, wxWindow* parentWindow = NULL);
|
wxHtmlHelpController(int style = wxHF_DEFAULT_STYLE, wxWindow* parentWindow = NULL);
|
||||||
wxHtmlHelpController(wxWindow* parentWindow, int style = wxHF_DEFAULT_STYLE);
|
wxHtmlHelpController(wxWindow* parentWindow, int style = wxHF_DEFAULT_STYLE);
|
||||||
|
|
||||||
virtual ~wxHtmlHelpController();
|
virtual ~wxHtmlHelpController();
|
||||||
|
|
||||||
void SetShouldPreventAppExit(bool enable);
|
void SetShouldPreventAppExit(bool enable);
|
||||||
@@ -117,7 +117,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
void Init(int style);
|
void Init(int style);
|
||||||
|
|
||||||
virtual wxWindow* CreateHelpWindow();
|
virtual wxWindow* CreateHelpWindow();
|
||||||
virtual wxHtmlHelpFrame* CreateHelpFrame(wxHtmlHelpData *data);
|
virtual wxHtmlHelpFrame* CreateHelpFrame(wxHtmlHelpData *data);
|
||||||
virtual wxHtmlHelpDialog* CreateHelpDialog(wxHtmlHelpData *data);
|
virtual wxHtmlHelpDialog* CreateHelpDialog(wxHtmlHelpData *data);
|
||||||
|
@@ -107,11 +107,11 @@ private:
|
|||||||
wxString m_pageTitle;
|
wxString m_pageTitle;
|
||||||
|
|
||||||
OSXWebViewPtr m_webView;
|
OSXWebViewPtr m_webView;
|
||||||
|
|
||||||
WX_NSObject m_frameLoadMonitor;
|
WX_NSObject m_frameLoadMonitor;
|
||||||
WX_NSObject m_policyDelegate;
|
WX_NSObject m_policyDelegate;
|
||||||
WX_NSObject m_UIDelegate;
|
WX_NSObject m_UIDelegate;
|
||||||
|
|
||||||
// we may use this later to setup our own mouse events,
|
// we may use this later to setup our own mouse events,
|
||||||
// so leave it in for now.
|
// so leave it in for now.
|
||||||
void* m_webKitCtrlEventHandler;
|
void* m_webKitCtrlEventHandler;
|
||||||
|
@@ -65,10 +65,10 @@ public:
|
|||||||
|
|
||||||
// accessors for individual modifier keys
|
// accessors for individual modifier keys
|
||||||
bool ControlDown() const { return m_controlDown; }
|
bool ControlDown() const { return m_controlDown; }
|
||||||
bool RawControlDown() const
|
bool RawControlDown() const
|
||||||
{
|
{
|
||||||
#ifdef __WXOSX__
|
#ifdef __WXOSX__
|
||||||
return m_rawControlDown;
|
return m_rawControlDown;
|
||||||
#else
|
#else
|
||||||
return m_controlDown;
|
return m_controlDown;
|
||||||
#endif
|
#endif
|
||||||
@@ -91,12 +91,12 @@ public:
|
|||||||
// ---------------------------------------------------
|
// ---------------------------------------------------
|
||||||
|
|
||||||
void SetControlDown(bool down) { m_controlDown = down; }
|
void SetControlDown(bool down) { m_controlDown = down; }
|
||||||
void SetRawControlDown(bool down)
|
void SetRawControlDown(bool down)
|
||||||
{
|
{
|
||||||
#ifdef __WXOSX__
|
#ifdef __WXOSX__
|
||||||
m_rawControlDown = down;
|
m_rawControlDown = down;
|
||||||
#else
|
#else
|
||||||
m_controlDown = down;
|
m_controlDown = down;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
void SetShiftDown(bool down) { m_shiftDown = down; }
|
void SetShiftDown(bool down) { m_shiftDown = down; }
|
||||||
|
@@ -406,7 +406,7 @@ private:
|
|||||||
wxDECLARE_NO_COPY_CLASS(wxMenuBase);
|
wxDECLARE_NO_COPY_CLASS(wxMenuBase);
|
||||||
};
|
};
|
||||||
|
|
||||||
#if wxUSE_EXTENDED_RTTI
|
#if wxUSE_EXTENDED_RTTI
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// XTI accessor
|
// XTI accessor
|
||||||
@@ -417,17 +417,17 @@ class WXDLLEXPORT wxMenuInfoHelper : public wxObject
|
|||||||
public:
|
public:
|
||||||
wxMenuInfoHelper() { m_menu = NULL; }
|
wxMenuInfoHelper() { m_menu = NULL; }
|
||||||
virtual ~wxMenuInfoHelper() { }
|
virtual ~wxMenuInfoHelper() { }
|
||||||
|
|
||||||
bool Create( wxMenu *menu, const wxString &title )
|
bool Create( wxMenu *menu, const wxString &title )
|
||||||
{
|
{
|
||||||
m_menu = menu;
|
m_menu = menu;
|
||||||
m_title = title;
|
m_title = title;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxMenu* GetMenu() const { return m_menu; }
|
wxMenu* GetMenu() const { return m_menu; }
|
||||||
wxString GetTitle() const { return m_title; }
|
wxString GetTitle() const { return m_title; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxMenu *m_menu;
|
wxMenu *m_menu;
|
||||||
wxString m_title;
|
wxString m_title;
|
||||||
@@ -555,13 +555,13 @@ public:
|
|||||||
|
|
||||||
virtual bool CanBeOutsideClientArea() const wxOVERRIDE { return true; }
|
virtual bool CanBeOutsideClientArea() const wxOVERRIDE { return true; }
|
||||||
|
|
||||||
#if wxUSE_EXTENDED_RTTI
|
#if wxUSE_EXTENDED_RTTI
|
||||||
// XTI helpers:
|
// XTI helpers:
|
||||||
bool AppendMenuInfo( const wxMenuInfoHelper *info )
|
bool AppendMenuInfo( const wxMenuInfoHelper *info )
|
||||||
{ return Append( info->GetMenu(), info->GetTitle() ); }
|
{ return Append( info->GetMenu(), info->GetTitle() ); }
|
||||||
const wxMenuInfoHelperList& GetMenuInfos() const;
|
const wxMenuInfoHelperList& GetMenuInfos() const;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if WXWIN_COMPATIBILITY_2_8
|
#if WXWIN_COMPATIBILITY_2_8
|
||||||
// get or change the label of the menu at given position
|
// get or change the label of the menu at given position
|
||||||
// Deprecated in favour of SetMenuLabel
|
// Deprecated in favour of SetMenuLabel
|
||||||
@@ -574,11 +574,11 @@ protected:
|
|||||||
// the list of all our menus
|
// the list of all our menus
|
||||||
wxMenuList m_menus;
|
wxMenuList m_menus;
|
||||||
|
|
||||||
#if wxUSE_EXTENDED_RTTI
|
#if wxUSE_EXTENDED_RTTI
|
||||||
// used by XTI
|
// used by XTI
|
||||||
wxMenuInfoHelperList m_menuInfos;
|
wxMenuInfoHelperList m_menuInfos;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// the frame we are attached to (may be NULL)
|
// the frame we are attached to (may be NULL)
|
||||||
wxFrame *m_menuBarFrame;
|
wxFrame *m_menuBarFrame;
|
||||||
|
|
||||||
|
@@ -125,7 +125,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
void* GetHandle() const wxOVERRIDE { return (void*)GetHDC(); }
|
void* GetHandle() const wxOVERRIDE { return (void*)GetHDC(); }
|
||||||
|
|
||||||
const wxBitmap& GetSelectedBitmap() const wxOVERRIDE { return m_selectedBitmap; }
|
const wxBitmap& GetSelectedBitmap() const wxOVERRIDE { return m_selectedBitmap; }
|
||||||
wxBitmap& GetSelectedBitmap() wxOVERRIDE { return m_selectedBitmap; }
|
wxBitmap& GetSelectedBitmap() wxOVERRIDE { return m_selectedBitmap; }
|
||||||
|
|
||||||
|
@@ -58,7 +58,7 @@ protected:
|
|||||||
virtual void DoSetSize(int x, int y,
|
virtual void DoSetSize(int x, int y,
|
||||||
int width, int height,
|
int width, int height,
|
||||||
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
virtual void DoSetCount(unsigned int count) wxOVERRIDE;
|
virtual void DoSetCount(unsigned int count) wxOVERRIDE;
|
||||||
|
@@ -262,7 +262,7 @@
|
|||||||
#define TVM_GETEXTENDEDSTYLE (TV_FIRST + 45)
|
#define TVM_GETEXTENDEDSTYLE (TV_FIRST + 45)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Various defines used by the webview library that are needed by mingw
|
// Various defines used by the webview library that are needed by mingw
|
||||||
|
|
||||||
#ifndef DISPID_COMMANDSTATECHANGE
|
#ifndef DISPID_COMMANDSTATECHANGE
|
||||||
#define DISPID_COMMANDSTATECHANGE 105
|
#define DISPID_COMMANDSTATECHANGE 105
|
||||||
|
@@ -82,7 +82,7 @@ public:
|
|||||||
// TODO change semantics to be in line with cocoa (make autrelease NOT increase the count)
|
// TODO change semantics to be in line with cocoa (make autrelease NOT increase the count)
|
||||||
void MacAddToAutorelease( void* cfrefobj );
|
void MacAddToAutorelease( void* cfrefobj );
|
||||||
void MacReleaseAutoreleasePool();
|
void MacReleaseAutoreleasePool();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static wxWindow* s_captureWindow ;
|
static wxWindow* s_captureWindow ;
|
||||||
static long s_lastModifiers ;
|
static long s_lastModifiers ;
|
||||||
@@ -95,7 +95,7 @@ protected:
|
|||||||
// override for support of custom app controllers
|
// override for support of custom app controllers
|
||||||
virtual WX_NSObject OSXCreateAppController();
|
virtual WX_NSObject OSXCreateAppController();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual bool DoInitGui();
|
virtual bool DoInitGui();
|
||||||
virtual void DoCleanUp();
|
virtual void DoCleanUp();
|
||||||
@@ -155,14 +155,14 @@ private:
|
|||||||
wxArrayString m_openFiles;
|
wxArrayString m_openFiles;
|
||||||
wxArrayString m_printFiles;
|
wxArrayString m_printFiles;
|
||||||
wxString m_getURL;
|
wxString m_getURL;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
bool OSXInitWasCalled() { return m_inited; }
|
bool OSXInitWasCalled() { return m_inited; }
|
||||||
void OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
|
void OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
|
||||||
void OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; }
|
void OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; }
|
||||||
void OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; }
|
void OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Hide the application windows the same as the system hide command would do it.
|
// Hide the application windows the same as the system hide command would do it.
|
||||||
void MacHideApp();
|
void MacHideApp();
|
||||||
|
|
||||||
|
@@ -107,7 +107,7 @@ public:
|
|||||||
|
|
||||||
// Constructor for generalised creation from data
|
// Constructor for generalised creation from data
|
||||||
wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1);
|
wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1);
|
||||||
|
|
||||||
// creates an bitmap from the native image format
|
// creates an bitmap from the native image format
|
||||||
wxBitmap(CGImageRef image, double scale = 1.0);
|
wxBitmap(CGImageRef image, double scale = 1.0);
|
||||||
wxBitmap(WXImage image);
|
wxBitmap(WXImage image);
|
||||||
@@ -115,7 +115,7 @@ public:
|
|||||||
|
|
||||||
// Create a bitmap compatible with the given DC
|
// Create a bitmap compatible with the given DC
|
||||||
wxBitmap(int width, int height, const wxDC& dc);
|
wxBitmap(int width, int height, const wxDC& dc);
|
||||||
|
|
||||||
// If depth is omitted, will create a bitmap compatible with the display
|
// If depth is omitted, will create a bitmap compatible with the display
|
||||||
wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); }
|
wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); }
|
||||||
wxBitmap(const wxSize& sz, int depth = -1) { (void)Create(sz, depth); }
|
wxBitmap(const wxSize& sz, int depth = -1) { (void)Create(sz, depth); }
|
||||||
@@ -141,13 +141,13 @@ public:
|
|||||||
bool Create( CGImageRef image, double scale = 1.0 );
|
bool Create( CGImageRef image, double scale = 1.0 );
|
||||||
bool Create( WXImage image );
|
bool Create( WXImage image );
|
||||||
bool Create( CGContextRef bitmapcontext);
|
bool Create( CGContextRef bitmapcontext);
|
||||||
|
|
||||||
// Create a bitmap compatible with the given DC, inheriting its magnification factor
|
// Create a bitmap compatible with the given DC, inheriting its magnification factor
|
||||||
bool Create(int width, int height, const wxDC& dc);
|
bool Create(int width, int height, const wxDC& dc);
|
||||||
|
|
||||||
// Create a bitmap with a scale factor, width and height are multiplied with that factor
|
// Create a bitmap with a scale factor, width and height are multiplied with that factor
|
||||||
bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale);
|
bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale);
|
||||||
|
|
||||||
// virtual bool Create( WXHICON icon) ;
|
// virtual bool Create( WXHICON icon) ;
|
||||||
virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
|
virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
|
||||||
virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
|
virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
|
||||||
|
@@ -22,7 +22,7 @@
|
|||||||
/*
|
/*
|
||||||
* leave is isFlipped and don't override
|
* leave is isFlipped and don't override
|
||||||
*/
|
*/
|
||||||
#ifndef wxOSX_USE_NATIVE_FLIPPED
|
#ifndef wxOSX_USE_NATIVE_FLIPPED
|
||||||
#define wxOSX_USE_NATIVE_FLIPPED 1
|
#define wxOSX_USE_NATIVE_FLIPPED 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -532,7 +532,7 @@ public:
|
|||||||
virtual void SetRowHeight(int height);
|
virtual void SetRowHeight(int height);
|
||||||
virtual void SetRowHeight(const wxDataViewItem& item, unsigned int height);
|
virtual void SetRowHeight(const wxDataViewItem& item, unsigned int height);
|
||||||
virtual void OnSize();
|
virtual void OnSize();
|
||||||
|
|
||||||
virtual void StartEditor( const wxDataViewItem & item, unsigned int column );
|
virtual void StartEditor( const wxDataViewItem & item, unsigned int column );
|
||||||
|
|
||||||
// drag & drop helper methods
|
// drag & drop helper methods
|
||||||
|
@@ -15,16 +15,16 @@ class WXDLLIMPEXP_BASE wxGUIEventLoop : public wxCFEventLoop
|
|||||||
public:
|
public:
|
||||||
wxGUIEventLoop();
|
wxGUIEventLoop();
|
||||||
~wxGUIEventLoop();
|
~wxGUIEventLoop();
|
||||||
|
|
||||||
void BeginModalSession( wxWindow* modalWindow );
|
void BeginModalSession( wxWindow* modalWindow );
|
||||||
|
|
||||||
void EndModalSession();
|
void EndModalSession();
|
||||||
|
|
||||||
virtual void WakeUp();
|
virtual void WakeUp();
|
||||||
|
|
||||||
void OSXUseLowLevelWakeup(bool useIt)
|
void OSXUseLowLevelWakeup(bool useIt)
|
||||||
{ m_osxLowLevelWakeUp = useIt ; }
|
{ m_osxLowLevelWakeUp = useIt ; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual int DoDispatchTimeout(unsigned long timeout);
|
virtual int DoDispatchTimeout(unsigned long timeout);
|
||||||
|
|
||||||
@@ -32,15 +32,15 @@ protected:
|
|||||||
virtual void OSXDoStop();
|
virtual void OSXDoStop();
|
||||||
|
|
||||||
virtual CFRunLoopRef CFGetCurrentRunLoop() const;
|
virtual CFRunLoopRef CFGetCurrentRunLoop() const;
|
||||||
|
|
||||||
void* m_modalSession;
|
void* m_modalSession;
|
||||||
|
|
||||||
wxWindow* m_modalWindow;
|
wxWindow* m_modalWindow;
|
||||||
|
|
||||||
WXWindow m_dummyWindow;
|
WXWindow m_dummyWindow;
|
||||||
|
|
||||||
int m_modalNestedLevel;
|
int m_modalNestedLevel;
|
||||||
|
|
||||||
bool m_osxLowLevelWakeUp;
|
bool m_osxLowLevelWakeUp;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -163,7 +163,7 @@ public :
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
virtual double GetContentScaleFactor() const;
|
virtual double GetContentScaleFactor() const;
|
||||||
|
|
||||||
// cocoa thunk connected calls
|
// cocoa thunk connected calls
|
||||||
|
|
||||||
#if wxUSE_DRAG_AND_DROP
|
#if wxUSE_DRAG_AND_DROP
|
||||||
@@ -281,20 +281,20 @@ public :
|
|||||||
virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE;
|
virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE;
|
||||||
|
|
||||||
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
|
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
|
||||||
|
|
||||||
CGWindowLevel GetWindowLevel() const wxOVERRIDE { return m_macWindowLevel; }
|
CGWindowLevel GetWindowLevel() const wxOVERRIDE { return m_macWindowLevel; }
|
||||||
void RestoreWindowLevel() wxOVERRIDE;
|
void RestoreWindowLevel() wxOVERRIDE;
|
||||||
|
|
||||||
static WX_NSResponder GetNextFirstResponder() ;
|
static WX_NSResponder GetNextFirstResponder() ;
|
||||||
static WX_NSResponder GetFormerFirstResponder() ;
|
static WX_NSResponder GetFormerFirstResponder() ;
|
||||||
protected :
|
protected :
|
||||||
CGWindowLevel m_macWindowLevel;
|
CGWindowLevel m_macWindowLevel;
|
||||||
WXWindow m_macWindow;
|
WXWindow m_macWindow;
|
||||||
void * m_macFullScreenData ;
|
void * m_macFullScreenData ;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void SetUpForModalParent();
|
void SetUpForModalParent();
|
||||||
|
|
||||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl);
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -308,7 +308,7 @@ public:
|
|||||||
#if wxUSE_MARKUP
|
#if wxUSE_MARKUP
|
||||||
virtual void SetLabelMarkup(const wxString& markup);
|
virtual void SetLabelMarkup(const wxString& markup);
|
||||||
#endif // wxUSE_MARKUP
|
#endif // wxUSE_MARKUP
|
||||||
|
|
||||||
void SetPressedBitmap( const wxBitmap& bitmap );
|
void SetPressedBitmap( const wxBitmap& bitmap );
|
||||||
void GetLayoutInset(int &left , int &top , int &right, int &bottom) const;
|
void GetLayoutInset(int &left , int &top , int &right, int &bottom) const;
|
||||||
void SetAcceleratorFromLabel(const wxString& label);
|
void SetAcceleratorFromLabel(const wxString& label);
|
||||||
|
@@ -97,7 +97,7 @@ public:
|
|||||||
virtual ~wxNSTextViewControl();
|
virtual ~wxNSTextViewControl();
|
||||||
|
|
||||||
virtual void insertText(NSString* text, WXWidget slf, void *_cmd) wxOVERRIDE;
|
virtual void insertText(NSString* text, WXWidget slf, void *_cmd) wxOVERRIDE;
|
||||||
|
|
||||||
virtual wxString GetStringValue() const wxOVERRIDE ;
|
virtual wxString GetStringValue() const wxOVERRIDE ;
|
||||||
virtual void SetStringValue( const wxString &str) wxOVERRIDE ;
|
virtual void SetStringValue( const wxString &str) wxOVERRIDE ;
|
||||||
virtual void Copy() wxOVERRIDE ;
|
virtual void Copy() wxOVERRIDE ;
|
||||||
|
@@ -119,7 +119,7 @@ public:
|
|||||||
{
|
{
|
||||||
SetValue(key, wxCFNumberRef(v));
|
SetValue(key, wxCFNumberRef(v));
|
||||||
}
|
}
|
||||||
|
|
||||||
CFMutableDictionaryRef CreateCopy() const
|
CFMutableDictionaryRef CreateCopy() const
|
||||||
{
|
{
|
||||||
return CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, this->m_ptr);
|
return CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, this->m_ptr);
|
||||||
|
@@ -176,7 +176,7 @@ public:
|
|||||||
*/
|
*/
|
||||||
wxCFRef(refType p) : m_ptr(p)
|
wxCFRef(refType p) : m_ptr(p)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
/*! @method wxCFRef
|
/*! @method wxCFRef
|
||||||
@abstract Assumes ownership of p and creates a reference to it.
|
@abstract Assumes ownership of p and creates a reference to it.
|
||||||
@@ -190,7 +190,7 @@ public:
|
|||||||
This method is templated and takes an otherType *p. This prevents implicit conversion
|
This method is templated and takes an otherType *p. This prevents implicit conversion
|
||||||
using an operator refType() in a different ref-holding class type.
|
using an operator refType() in a different ref-holding class type.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
template <class otherType>
|
template <class otherType>
|
||||||
explicit wxCFRef(otherType *p)
|
explicit wxCFRef(otherType *p)
|
||||||
: m_ptr(p) // Implicit conversion from otherType* to refType should occur.
|
: m_ptr(p) // Implicit conversion from otherType* to refType should occur.
|
||||||
|
@@ -47,10 +47,10 @@ public:
|
|||||||
|
|
||||||
// This ctor does take ownership of the color.
|
// This ctor does take ownership of the color.
|
||||||
wxColour( CGColorRef col );
|
wxColour( CGColorRef col );
|
||||||
|
|
||||||
// don't take ownership of the returned value
|
// don't take ownership of the returned value
|
||||||
CGColorRef GetCGColor() const;
|
CGColorRef GetCGColor() const;
|
||||||
|
|
||||||
// do take ownership of the returned value
|
// do take ownership of the returned value
|
||||||
CGColorRef CreateCGColor() const { return wxCFRetain(GetCGColor()); }
|
CGColorRef CreateCGColor() const { return wxCFRetain(GetCGColor()); }
|
||||||
|
|
||||||
@@ -69,7 +69,7 @@ public:
|
|||||||
explicit wxColour(WX_NSColor color);
|
explicit wxColour(WX_NSColor color);
|
||||||
WX_NSColor OSXGetNSColor() const;
|
WX_NSColor OSXGetNSColor() const;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
protected :
|
protected :
|
||||||
virtual void
|
virtual void
|
||||||
InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) wxOVERRIDE;
|
InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) wxOVERRIDE;
|
||||||
@@ -87,19 +87,19 @@ class wxColourRefData : public wxGDIRefData
|
|||||||
public:
|
public:
|
||||||
wxColourRefData() {}
|
wxColourRefData() {}
|
||||||
virtual ~wxColourRefData() {}
|
virtual ~wxColourRefData() {}
|
||||||
|
|
||||||
virtual CGFloat Red() const = 0;
|
virtual CGFloat Red() const = 0;
|
||||||
virtual CGFloat Green() const = 0;
|
virtual CGFloat Green() const = 0;
|
||||||
virtual CGFloat Blue() const = 0;
|
virtual CGFloat Blue() const = 0;
|
||||||
virtual CGFloat Alpha() const = 0;
|
virtual CGFloat Alpha() const = 0;
|
||||||
|
|
||||||
virtual bool IsSolid() const
|
virtual bool IsSolid() const
|
||||||
{ return true; }
|
{ return true; }
|
||||||
|
|
||||||
virtual CGColorRef GetCGColor() const = 0;
|
virtual CGColorRef GetCGColor() const = 0;
|
||||||
|
|
||||||
virtual wxColourRefData* Clone() const = 0;
|
virtual wxColourRefData* Clone() const = 0;
|
||||||
|
|
||||||
#if wxOSX_USE_COCOA
|
#if wxOSX_USE_COCOA
|
||||||
virtual WX_NSColor GetNSColor() const;
|
virtual WX_NSColor GetNSColor() const;
|
||||||
#endif
|
#endif
|
||||||
|
@@ -43,7 +43,7 @@ public:
|
|||||||
virtual void WakeUp();
|
virtual void WakeUp();
|
||||||
|
|
||||||
bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; }
|
bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; }
|
||||||
|
|
||||||
#if wxUSE_UIACTIONSIMULATOR
|
#if wxUSE_UIACTIONSIMULATOR
|
||||||
// notifies Yield and Dispatch to wait for at least one event before
|
// notifies Yield and Dispatch to wait for at least one event before
|
||||||
// returning, this is necessary, because the synthesized events need to be
|
// returning, this is necessary, because the synthesized events need to be
|
||||||
|
@@ -168,7 +168,7 @@ public :
|
|||||||
const wxString& strHelp,
|
const wxString& strHelp,
|
||||||
wxItemKind kind,
|
wxItemKind kind,
|
||||||
wxMenu *pSubMenu );
|
wxMenu *pSubMenu );
|
||||||
|
|
||||||
// handle OS specific menu items if they weren't handled during normal processing
|
// handle OS specific menu items if they weren't handled during normal processing
|
||||||
virtual bool DoDefault() { return false; }
|
virtual bool DoDefault() { return false; }
|
||||||
protected :
|
protected :
|
||||||
@@ -197,7 +197,7 @@ public :
|
|||||||
wxMenu* GetWXPeer() { return m_peer ; }
|
wxMenu* GetWXPeer() { return m_peer ; }
|
||||||
|
|
||||||
virtual void PopUp( wxWindow *win, int x, int y ) = 0;
|
virtual void PopUp( wxWindow *win, int x, int y ) = 0;
|
||||||
|
|
||||||
virtual void GetMenuBarDimensions(int &x, int &y, int &width, int &height) const
|
virtual void GetMenuBarDimensions(int &x, int &y, int &width, int &height) const
|
||||||
{
|
{
|
||||||
x = y = width = height = -1;
|
x = y = width = height = -1;
|
||||||
@@ -232,13 +232,13 @@ public :
|
|||||||
void Init();
|
void Init();
|
||||||
|
|
||||||
bool IsRootControl() const { return m_isRootControl; }
|
bool IsRootControl() const { return m_isRootControl; }
|
||||||
|
|
||||||
// is a custom control that has all events handled in wx code, no built-ins
|
// is a custom control that has all events handled in wx code, no built-ins
|
||||||
bool IsUserPane() const { return m_isUserPane; }
|
bool IsUserPane() const { return m_isUserPane; }
|
||||||
|
|
||||||
// we are doing keyboard handling in wx code, other events might be handled natively
|
// we are doing keyboard handling in wx code, other events might be handled natively
|
||||||
virtual bool HasUserKeyHandling() const { return m_wantsUserKey; }
|
virtual bool HasUserKeyHandling() const { return m_wantsUserKey; }
|
||||||
|
|
||||||
// we are doing mouse handling in wx code, other events might be handled natively
|
// we are doing mouse handling in wx code, other events might be handled natively
|
||||||
virtual bool HasUserMouseHandling() const { return m_wantsUserMouse; }
|
virtual bool HasUserMouseHandling() const { return m_wantsUserMouse; }
|
||||||
|
|
||||||
@@ -280,7 +280,7 @@ public :
|
|||||||
{
|
{
|
||||||
return 1.0;
|
return 1.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// the native coordinates may have an 'aura' for shadows etc, if this is the case the layout
|
// the native coordinates may have an 'aura' for shadows etc, if this is the case the layout
|
||||||
// inset indicates on which insets the real control is drawn
|
// inset indicates on which insets the real control is drawn
|
||||||
virtual void GetLayoutInset(int &left , int &top , int &right, int &bottom) const
|
virtual void GetLayoutInset(int &left , int &top , int &right, int &bottom) const
|
||||||
@@ -299,7 +299,7 @@ public :
|
|||||||
|
|
||||||
virtual bool NeedsFrame() const;
|
virtual bool NeedsFrame() const;
|
||||||
virtual void SetNeedsFrame( bool needs );
|
virtual void SetNeedsFrame( bool needs );
|
||||||
|
|
||||||
virtual void SetDrawingEnabled(bool enabled);
|
virtual void SetDrawingEnabled(bool enabled);
|
||||||
|
|
||||||
virtual bool CanFocus() const = 0;
|
virtual bool CanFocus() const = 0;
|
||||||
@@ -322,7 +322,7 @@ public :
|
|||||||
virtual void SetCursor( const wxCursor & cursor ) = 0;
|
virtual void SetCursor( const wxCursor & cursor ) = 0;
|
||||||
virtual void CaptureMouse() = 0;
|
virtual void CaptureMouse() = 0;
|
||||||
virtual void ReleaseMouse() = 0;
|
virtual void ReleaseMouse() = 0;
|
||||||
|
|
||||||
virtual void SetDropTarget( wxDropTarget * WXUNUSED(dropTarget) ) {}
|
virtual void SetDropTarget( wxDropTarget * WXUNUSED(dropTarget) ) {}
|
||||||
|
|
||||||
virtual wxInt32 GetValue() const = 0;
|
virtual wxInt32 GetValue() const = 0;
|
||||||
@@ -371,7 +371,7 @@ public :
|
|||||||
// of a known control
|
// of a known control
|
||||||
static wxWidgetImpl*
|
static wxWidgetImpl*
|
||||||
FindBestFromWXWidget(WXWidget control);
|
FindBestFromWXWidget(WXWidget control);
|
||||||
|
|
||||||
static void RemoveAssociations( wxWidgetImpl* impl);
|
static void RemoveAssociations( wxWidgetImpl* impl);
|
||||||
static void RemoveAssociation(WXWidget control);
|
static void RemoveAssociation(WXWidget control);
|
||||||
|
|
||||||
@@ -955,7 +955,7 @@ public :
|
|||||||
virtual void ScreenToWindow( int *x, int *y ) = 0;
|
virtual void ScreenToWindow( int *x, int *y ) = 0;
|
||||||
|
|
||||||
virtual void WindowToScreen( int *x, int *y ) = 0;
|
virtual void WindowToScreen( int *x, int *y ) = 0;
|
||||||
|
|
||||||
virtual bool IsActive() = 0;
|
virtual bool IsActive() = 0;
|
||||||
|
|
||||||
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
|
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
|
||||||
|
@@ -30,7 +30,7 @@ public:
|
|||||||
// returns true if any of the accepted formats of this dataobj is in the pasteboard
|
// returns true if any of the accepted formats of this dataobj is in the pasteboard
|
||||||
bool HasDataInPasteboard( void * pasteboardRef );
|
bool HasDataInPasteboard( void * pasteboardRef );
|
||||||
bool GetFromPasteboard( void * pasteboardRef );
|
bool GetFromPasteboard( void * pasteboardRef );
|
||||||
|
|
||||||
#if wxOSX_USE_COCOA
|
#if wxOSX_USE_COCOA
|
||||||
virtual void AddSupportedTypes( void* cfarray);
|
virtual void AddSupportedTypes( void* cfarray);
|
||||||
#endif
|
#endif
|
||||||
|
@@ -205,7 +205,7 @@ public:
|
|||||||
|
|
||||||
// finishes editing of custom items; if no custom item is currently edited the method does nothing
|
// finishes editing of custom items; if no custom item is currently edited the method does nothing
|
||||||
void FinishCustomItemEditing();
|
void FinishCustomItemEditing();
|
||||||
|
|
||||||
virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) wxOVERRIDE;
|
virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) wxOVERRIDE;
|
||||||
|
|
||||||
// returns the n-th pointer to a column;
|
// returns the n-th pointer to a column;
|
||||||
|
@@ -62,7 +62,7 @@ public:
|
|||||||
static bool OSXHasModalDialogsOpen();
|
static bool OSXHasModalDialogsOpen();
|
||||||
void OSXBeginModalDialog();
|
void OSXBeginModalDialog();
|
||||||
void OSXEndModalDialog();
|
void OSXEndModalDialog();
|
||||||
|
|
||||||
#if wxOSX_USE_COCOA
|
#if wxOSX_USE_COCOA
|
||||||
bool OSXGetWorksWhenModal();
|
bool OSXGetWorksWhenModal();
|
||||||
void OSXSetWorksWhenModal(bool worksWhenModal);
|
void OSXSetWorksWhenModal(bool worksWhenModal);
|
||||||
@@ -94,7 +94,7 @@ protected:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void Init();
|
void Init();
|
||||||
|
|
||||||
static wxVector<wxDialog*> s_modalStack;
|
static wxVector<wxDialog*> s_modalStack;
|
||||||
#if wxOSX_USE_COCOA
|
#if wxOSX_USE_COCOA
|
||||||
static wxVector<bool> s_modalWorksStack;
|
static wxVector<bool> s_modalWorksStack;
|
||||||
|
@@ -23,7 +23,7 @@ class WXDLLIMPEXP_CORE wxModalEventLoop : public wxGUIEventLoop
|
|||||||
public:
|
public:
|
||||||
wxModalEventLoop(wxWindow *modalWindow);
|
wxModalEventLoop(wxWindow *modalWindow);
|
||||||
wxModalEventLoop(WXWindow modalNativeWindow);
|
wxModalEventLoop(WXWindow modalNativeWindow);
|
||||||
|
|
||||||
#ifdef __WXOSX_COCOA__
|
#ifdef __WXOSX_COCOA__
|
||||||
// skip wxGUIEventLoop to avoid missing Enter/Exit notifications
|
// skip wxGUIEventLoop to avoid missing Enter/Exit notifications
|
||||||
virtual int Run() { return wxCFEventLoop::Run(); }
|
virtual int Run() { return wxCFEventLoop::Run(); }
|
||||||
|
@@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxChoice;
|
|||||||
// wxFileDialog
|
// wxFileDialog
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
// set this system option to 1 in order to always show the filetypes popup in
|
// set this system option to 1 in order to always show the filetypes popup in
|
||||||
// file open dialogs if possible
|
// file open dialogs if possible
|
||||||
|
|
||||||
#define wxOSX_FILEDIALOG_ALWAYS_SHOW_TYPES wxT("osx.openfiledialog.always-show-types")
|
#define wxOSX_FILEDIALOG_ALWAYS_SHOW_TYPES wxT("osx.openfiledialog.always-show-types")
|
||||||
@@ -59,7 +59,7 @@ public:
|
|||||||
#if wxOSX_USE_COCOA
|
#if wxOSX_USE_COCOA
|
||||||
~wxFileDialog();
|
~wxFileDialog();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; }
|
virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; }
|
||||||
virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; }
|
virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; }
|
||||||
|
|
||||||
@@ -71,9 +71,9 @@ public:
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
virtual bool SupportsExtraControl() const;
|
virtual bool SupportsExtraControl() const;
|
||||||
|
|
||||||
// implementation only
|
// implementation only
|
||||||
|
|
||||||
#if wxOSX_USE_COCOA
|
#if wxOSX_USE_COCOA
|
||||||
// returns true if the file can be shown as active
|
// returns true if the file can be shown as active
|
||||||
bool CheckFile( const wxString& filename );
|
bool CheckFile( const wxString& filename );
|
||||||
@@ -86,7 +86,7 @@ protected:
|
|||||||
int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
|
int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
|
||||||
|
|
||||||
void SetupExtraControls(WXWindow nativeWindow);
|
void SetupExtraControls(WXWindow nativeWindow);
|
||||||
|
|
||||||
#if wxOSX_USE_COCOA
|
#if wxOSX_USE_COCOA
|
||||||
virtual wxWindow* CreateFilterPanel(wxWindow *extracontrol);
|
virtual wxWindow* CreateFilterPanel(wxWindow *extracontrol);
|
||||||
void DoOnFilterSelected(int index);
|
void DoOnFilterSelected(int index);
|
||||||
|
@@ -63,7 +63,7 @@ public :
|
|||||||
virtual void GetSize( int &width, int &height ) const;
|
virtual void GetSize( int &width, int &height ) const;
|
||||||
virtual void SetControlSize( wxWindowVariant variant );
|
virtual void SetControlSize( wxWindowVariant variant );
|
||||||
virtual double GetContentScaleFactor() const ;
|
virtual double GetContentScaleFactor() const ;
|
||||||
|
|
||||||
virtual void SetNeedsDisplay( const wxRect* where = NULL );
|
virtual void SetNeedsDisplay( const wxRect* where = NULL );
|
||||||
virtual bool GetNeedsDisplay() const;
|
virtual bool GetNeedsDisplay() const;
|
||||||
|
|
||||||
@@ -176,7 +176,7 @@ public :
|
|||||||
virtual bool IsFullScreen() const;
|
virtual bool IsFullScreen() const;
|
||||||
|
|
||||||
virtual bool EnableFullScreenView(bool enable);
|
virtual bool EnableFullScreenView(bool enable);
|
||||||
|
|
||||||
virtual bool ShowFullScreen(bool show, long style);
|
virtual bool ShowFullScreen(bool show, long style);
|
||||||
|
|
||||||
virtual void RequestUserAttention(int flags);
|
virtual void RequestUserAttention(int flags);
|
||||||
|
@@ -34,10 +34,10 @@ public :
|
|||||||
virtual void WriteText(const wxString& str) ;
|
virtual void WriteText(const wxString& str) ;
|
||||||
virtual bool HasOwnContextMenu() const { return true; }
|
virtual bool HasOwnContextMenu() const { return true; }
|
||||||
|
|
||||||
virtual wxSize GetBestSize() const;
|
virtual wxSize GetBestSize() const;
|
||||||
|
|
||||||
virtual bool SetHint(const wxString& hint);
|
virtual bool SetHint(const wxString& hint);
|
||||||
|
|
||||||
virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
|
virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
|
||||||
protected :
|
protected :
|
||||||
UITextField* m_textField;
|
UITextField* m_textField;
|
||||||
|
@@ -170,7 +170,7 @@ public:
|
|||||||
|
|
||||||
|
|
||||||
static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; }
|
static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; }
|
||||||
|
|
||||||
virtual void DoGetPosition(int *x, int *y) const;
|
virtual void DoGetPosition(int *x, int *y) const;
|
||||||
virtual void DoGetSize(int *width, int *height) const;
|
virtual void DoGetSize(int *width, int *height) const;
|
||||||
virtual void DoGetClientSize(int *width, int *height) const;
|
virtual void DoGetClientSize(int *width, int *height) const;
|
||||||
|
@@ -24,7 +24,7 @@ public:
|
|||||||
#if wxOSX_USE_COCOA
|
#if wxOSX_USE_COCOA
|
||||||
~wxMessageDialog();
|
~wxMessageDialog();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
virtual int ShowModal();
|
virtual int ShowModal();
|
||||||
|
|
||||||
#if wxOSX_USE_COCOA
|
#if wxOSX_USE_COCOA
|
||||||
|
@@ -64,7 +64,7 @@ public:
|
|||||||
virtual void UnsubclassWin();
|
virtual void UnsubclassWin();
|
||||||
|
|
||||||
virtual wxPoint GetClientAreaOrigin() const;
|
virtual wxPoint GetClientAreaOrigin() const;
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
|
|
||||||
virtual bool SetTransparent(wxByte alpha);
|
virtual bool SetTransparent(wxByte alpha);
|
||||||
@@ -151,7 +151,7 @@ protected:
|
|||||||
|
|
||||||
private :
|
private :
|
||||||
static clock_t s_lastFlush;
|
static clock_t s_lastFlush;
|
||||||
|
|
||||||
wxRegion m_shape;
|
wxRegion m_shape;
|
||||||
#if wxUSE_GRAPHICS_CONTEXT
|
#if wxUSE_GRAPHICS_CONTEXT
|
||||||
wxGraphicsPath m_shapePath;
|
wxGraphicsPath m_shapePath;
|
||||||
|
@@ -27,7 +27,7 @@ public:
|
|||||||
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
|
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
|
||||||
|
|
||||||
virtual bool Show(bool show = true);
|
virtual bool Show(bool show = true);
|
||||||
|
|
||||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -95,9 +95,9 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
// common part of all ctors
|
// common part of all ctors
|
||||||
void Init();
|
void Init();
|
||||||
|
|
||||||
void DoLayout();
|
void DoLayout();
|
||||||
|
|
||||||
void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
|
void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
|
||||||
|
|
||||||
#ifndef __WXOSX_IPHONE__
|
#ifndef __WXOSX_IPHONE__
|
||||||
|
@@ -82,7 +82,7 @@ public:
|
|||||||
|
|
||||||
virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); }
|
virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); }
|
||||||
virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); }
|
virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); }
|
||||||
|
|
||||||
virtual void OSXSetModified(bool modified) wxOVERRIDE;
|
virtual void OSXSetModified(bool modified) wxOVERRIDE;
|
||||||
virtual bool OSXIsModified() const wxOVERRIDE;
|
virtual bool OSXIsModified() const wxOVERRIDE;
|
||||||
|
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
|
|
||||||
#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX__)
|
#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX__)
|
||||||
|
|
||||||
#include "wx/control.h"
|
#include "wx/control.h"
|
||||||
#include "wx/webview.h"
|
#include "wx/webview.h"
|
||||||
@@ -86,10 +86,10 @@ public:
|
|||||||
|
|
||||||
//Find function
|
//Find function
|
||||||
virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE
|
virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE
|
||||||
{
|
{
|
||||||
wxUnusedVar(text);
|
wxUnusedVar(text);
|
||||||
wxUnusedVar(flags);
|
wxUnusedVar(flags);
|
||||||
return wxNOT_FOUND;
|
return wxNOT_FOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Clipboard functions
|
//Clipboard functions
|
||||||
|
@@ -52,7 +52,7 @@ public:
|
|||||||
const wxString& name = wxPanelNameStr );
|
const wxString& name = wxPanelNameStr );
|
||||||
|
|
||||||
virtual void SendSizeEvent(int flags = 0) wxOVERRIDE;
|
virtual void SendSizeEvent(int flags = 0) wxOVERRIDE;
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
virtual void SetLabel( const wxString& label ) wxOVERRIDE;
|
virtual void SetLabel( const wxString& label ) wxOVERRIDE;
|
||||||
virtual wxString GetLabel() const wxOVERRIDE;
|
virtual wxString GetLabel() const wxOVERRIDE;
|
||||||
@@ -92,10 +92,10 @@ public:
|
|||||||
|
|
||||||
virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
|
virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
|
||||||
virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const wxOVERRIDE;
|
virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const wxOVERRIDE;
|
||||||
|
|
||||||
virtual int GetCharHeight() const wxOVERRIDE;
|
virtual int GetCharHeight() const wxOVERRIDE;
|
||||||
virtual int GetCharWidth() const wxOVERRIDE;
|
virtual int GetCharWidth() const wxOVERRIDE;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
|
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
|
||||||
int range, bool refresh = true ) wxOVERRIDE;
|
int range, bool refresh = true ) wxOVERRIDE;
|
||||||
@@ -117,11 +117,11 @@ public:
|
|||||||
#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
|
#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
|
||||||
// hot keys (system wide accelerators)
|
// hot keys (system wide accelerators)
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) wxOVERRIDE;
|
virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) wxOVERRIDE;
|
||||||
virtual bool UnregisterHotKey(int hotkeyId) wxOVERRIDE;
|
virtual bool UnregisterHotKey(int hotkeyId) wxOVERRIDE;
|
||||||
#endif // wxUSE_HOTKEY
|
#endif // wxUSE_HOTKEY
|
||||||
|
|
||||||
#if wxUSE_DRAG_AND_DROP
|
#if wxUSE_DRAG_AND_DROP
|
||||||
virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE;
|
virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE;
|
||||||
|
|
||||||
@@ -255,7 +255,7 @@ public:
|
|||||||
|
|
||||||
// the 'true' OS level control for this wxWindow
|
// the 'true' OS level control for this wxWindow
|
||||||
wxOSXWidgetImpl* GetPeer() const;
|
wxOSXWidgetImpl* GetPeer() const;
|
||||||
|
|
||||||
// optimization to avoid creating a user pane in wxWindow::Create if we already know
|
// optimization to avoid creating a user pane in wxWindow::Create if we already know
|
||||||
// we will replace it with our own peer
|
// we will replace it with our own peer
|
||||||
void DontCreatePeer();
|
void DontCreatePeer();
|
||||||
@@ -263,10 +263,10 @@ public:
|
|||||||
// return true unless DontCreatePeer() had been called
|
// return true unless DontCreatePeer() had been called
|
||||||
bool ShouldCreatePeer() const;
|
bool ShouldCreatePeer() const;
|
||||||
|
|
||||||
// sets the native implementation wrapper, can replace an existing peer, use peer = NULL to
|
// sets the native implementation wrapper, can replace an existing peer, use peer = NULL to
|
||||||
// release existing peer
|
// release existing peer
|
||||||
void SetPeer(wxOSXWidgetImpl* peer);
|
void SetPeer(wxOSXWidgetImpl* peer);
|
||||||
|
|
||||||
// wraps the already existing peer with the wrapper
|
// wraps the already existing peer with the wrapper
|
||||||
void SetWrappingPeer(wxOSXWidgetImpl* wrapper);
|
void SetWrappingPeer(wxOSXWidgetImpl* wrapper);
|
||||||
|
|
||||||
@@ -289,9 +289,9 @@ public:
|
|||||||
virtual void OSXSimulateFocusEvents();
|
virtual void OSXSimulateFocusEvents();
|
||||||
|
|
||||||
bool IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
|
bool IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
|
||||||
|
|
||||||
double GetContentScaleFactor() const wxOVERRIDE;
|
double GetContentScaleFactor() const wxOVERRIDE;
|
||||||
|
|
||||||
// internal response to size events
|
// internal response to size events
|
||||||
virtual void MacOnInternalSize() {}
|
virtual void MacOnInternalSize() {}
|
||||||
|
|
||||||
|
@@ -66,7 +66,7 @@ protected:
|
|||||||
void SetActive(bool active)
|
void SetActive(bool active)
|
||||||
{
|
{
|
||||||
m_active = active;
|
m_active = active;
|
||||||
|
|
||||||
// Delete the implementation if the notification is detached
|
// Delete the implementation if the notification is detached
|
||||||
if (!m_notification && !active)
|
if (!m_notification && !active)
|
||||||
delete this;
|
delete this;
|
||||||
|
@@ -52,8 +52,8 @@ protected:
|
|||||||
// ref counting code
|
// ref counting code
|
||||||
virtual wxObjectRefData *CreateRefData() const;
|
virtual wxObjectRefData *CreateRefData() const;
|
||||||
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
|
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
|
wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -15,15 +15,15 @@ class WXDLLIMPEXP_CORE wxApp : public wxAppBase
|
|||||||
public:
|
public:
|
||||||
wxApp();
|
wxApp();
|
||||||
~wxApp();
|
~wxApp();
|
||||||
|
|
||||||
virtual bool Initialize(int& argc, wxChar **argv);
|
virtual bool Initialize(int& argc, wxChar **argv);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QApplication *m_qtApplication;
|
QApplication *m_qtApplication;
|
||||||
int m_qtArgc;
|
int m_qtArgc;
|
||||||
char **m_qtArgv;
|
char **m_qtArgv;
|
||||||
|
|
||||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxApp );
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxApp );
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _WX_QT_APP_H_
|
#endif // _WX_QT_APP_H_
|
||||||
|
@@ -29,7 +29,7 @@ public:
|
|||||||
wxBitmap(const char* const* bits);
|
wxBitmap(const char* const* bits);
|
||||||
wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
|
wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
|
||||||
wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH, double scale = 1.0);
|
wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH, double scale = 1.0);
|
||||||
|
|
||||||
// Convert from wxIcon / wxCursor
|
// Convert from wxIcon / wxCursor
|
||||||
wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
|
wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
|
||||||
explicit wxBitmap(const wxCursor& cursor);
|
explicit wxBitmap(const wxCursor& cursor);
|
||||||
|
@@ -35,7 +35,7 @@ public:
|
|||||||
|
|
||||||
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
|
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
|
||||||
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
|
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
|
||||||
|
|
||||||
QBrush GetHandle() const;
|
QBrush GetHandle() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxChoice();
|
wxChoice();
|
||||||
|
|
||||||
wxChoice( wxWindow *parent, wxWindowID id,
|
wxChoice( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
@@ -22,7 +22,7 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxChoiceNameStr );
|
const wxString& name = wxChoiceNameStr );
|
||||||
|
|
||||||
wxChoice( wxWindow *parent, wxWindowID id,
|
wxChoice( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
@@ -38,7 +38,7 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxChoiceNameStr );
|
const wxString& name = wxChoiceNameStr );
|
||||||
|
|
||||||
bool Create( wxWindow *parent, wxWindowID id,
|
bool Create( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
@@ -64,7 +64,7 @@ protected:
|
|||||||
void **clientData,
|
void **clientData,
|
||||||
wxClientDataType type);
|
wxClientDataType type);
|
||||||
virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
|
virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
|
||||||
|
|
||||||
virtual void DoSetItemClientData(unsigned int n, void *clientData);
|
virtual void DoSetItemClientData(unsigned int n, void *clientData);
|
||||||
virtual void *DoGetItemClientData(unsigned int n) const;
|
virtual void *DoGetItemClientData(unsigned int n) const;
|
||||||
|
|
||||||
|
@@ -29,7 +29,7 @@ public:
|
|||||||
|
|
||||||
virtual wxPoint GetHotSpot() const;
|
virtual wxPoint GetHotSpot() const;
|
||||||
QCursor &GetHandle() const;
|
QCursor &GetHandle() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void InitFromStock( wxStockCursor cursorId );
|
void InitFromStock( wxStockCursor cursorId );
|
||||||
#if wxUSE_IMAGE
|
#if wxUSE_IMAGE
|
||||||
|
@@ -20,7 +20,7 @@ public:
|
|||||||
wxDataFormat(const wxChar *id);
|
wxDataFormat(const wxChar *id);
|
||||||
|
|
||||||
void SetId( const wxChar *id );
|
void SetId( const wxChar *id );
|
||||||
|
|
||||||
bool operator==(wxDataFormatId format) const;
|
bool operator==(wxDataFormatId format) const;
|
||||||
bool operator!=(wxDataFormatId format) const;
|
bool operator!=(wxDataFormatId format) const;
|
||||||
bool operator==(const wxDataFormat& format) const;
|
bool operator==(const wxDataFormat& format) const;
|
||||||
|
@@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
|
|||||||
public:
|
public:
|
||||||
wxDataObject();
|
wxDataObject();
|
||||||
~wxDataObject();
|
~wxDataObject();
|
||||||
|
|
||||||
virtual bool IsSupportedFormat(const wxDataFormat& format, Direction dir) const;
|
virtual bool IsSupportedFormat(const wxDataFormat& format, Direction dir) const;
|
||||||
virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const;
|
virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const;
|
||||||
virtual size_t GetFormatCount(Direction dir = Get) const;
|
virtual size_t GetFormatCount(Direction dir = Get) const;
|
||||||
|
@@ -112,7 +112,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual QPixmap *GetQPixmap() { return m_qtPixmap; }
|
virtual QPixmap *GetQPixmap() { return m_qtPixmap; }
|
||||||
|
|
||||||
QPainter *m_qtPainter;
|
QPainter *m_qtPainter;
|
||||||
QPixmap *m_qtPixmap;
|
QPixmap *m_qtPixmap;
|
||||||
|
|
||||||
@@ -132,7 +132,7 @@ private:
|
|||||||
|
|
||||||
wxDECLARE_CLASS(wxQtDCImpl);
|
wxDECLARE_CLASS(wxQtDCImpl);
|
||||||
wxDECLARE_NO_COPY_CLASS(wxQtDCImpl);
|
wxDECLARE_NO_COPY_CLASS(wxQtDCImpl);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _WX_QT_DC_H_
|
#endif // _WX_QT_DC_H_
|
||||||
|
@@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxDCImpl
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxPrinterDCImpl( wxPrinterDC *, const wxPrintData & );
|
wxPrinterDCImpl( wxPrinterDC *, const wxPrintData & );
|
||||||
|
|
||||||
virtual bool CanDrawBitmap() const;
|
virtual bool CanDrawBitmap() const;
|
||||||
virtual bool CanGetTextExtent() const;
|
virtual bool CanGetTextExtent() const;
|
||||||
|
|
||||||
@@ -35,7 +35,7 @@ public:
|
|||||||
#endif // wxUSE_PALETTE
|
#endif // wxUSE_PALETTE
|
||||||
|
|
||||||
virtual void SetLogicalFunction(wxRasterOperationMode function);
|
virtual void SetLogicalFunction(wxRasterOperationMode function);
|
||||||
|
|
||||||
virtual wxCoord GetCharHeight() const;
|
virtual wxCoord GetCharHeight() const;
|
||||||
virtual wxCoord GetCharWidth() const;
|
virtual wxCoord GetCharWidth() const;
|
||||||
virtual void DoGetTextExtent(const wxString& string,
|
virtual void DoGetTextExtent(const wxString& string,
|
||||||
@@ -43,7 +43,7 @@ public:
|
|||||||
wxCoord *descent = NULL,
|
wxCoord *descent = NULL,
|
||||||
wxCoord *externalLeading = NULL,
|
wxCoord *externalLeading = NULL,
|
||||||
const wxFont *theFont = NULL) const;
|
const wxFont *theFont = NULL) const;
|
||||||
|
|
||||||
virtual void Clear();
|
virtual void Clear();
|
||||||
|
|
||||||
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
||||||
@@ -53,7 +53,7 @@ public:
|
|||||||
|
|
||||||
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
|
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
|
||||||
wxFloodFillStyle style = wxFLOOD_SURFACE);
|
wxFloodFillStyle style = wxFLOOD_SURFACE);
|
||||||
|
|
||||||
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
|
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
|
||||||
|
|
||||||
virtual void DoDrawPoint(wxCoord x, wxCoord y);
|
virtual void DoDrawPoint(wxCoord x, wxCoord y);
|
||||||
|
@@ -12,6 +12,6 @@
|
|||||||
|
|
||||||
typedef class QWidget *WXWidget;
|
typedef class QWidget *WXWidget;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* _WX_QT_DEFS_H_ */
|
#endif /* _WX_QT_DEFS_H_ */
|
||||||
|
@@ -23,7 +23,7 @@ public:
|
|||||||
const wxString &name = wxDialogNameStr );
|
const wxString &name = wxDialogNameStr );
|
||||||
|
|
||||||
virtual ~wxDialog();
|
virtual ~wxDialog();
|
||||||
|
|
||||||
bool Create( wxWindow *parent, wxWindowID id,
|
bool Create( wxWindow *parent, wxWindowID id,
|
||||||
const wxString &title,
|
const wxString &title,
|
||||||
const wxPoint &pos = wxDefaultPosition,
|
const wxPoint &pos = wxDefaultPosition,
|
||||||
|
@@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxDropTarget(wxDataObject *dataObject = NULL );
|
wxDropTarget(wxDataObject *dataObject = NULL );
|
||||||
|
|
||||||
virtual bool OnDrop(wxCoord x, wxCoord y);
|
virtual bool OnDrop(wxCoord x, wxCoord y);
|
||||||
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
|
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
|
||||||
virtual bool GetData();
|
virtual bool GetData();
|
||||||
@@ -40,7 +40,7 @@ public:
|
|||||||
const wxIcon © = wxNullIcon,
|
const wxIcon © = wxNullIcon,
|
||||||
const wxIcon &move = wxNullIcon,
|
const wxIcon &move = wxNullIcon,
|
||||||
const wxIcon &none = wxNullIcon);
|
const wxIcon &none = wxNullIcon);
|
||||||
|
|
||||||
virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
|
virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
|
||||||
};
|
};
|
||||||
#endif // _WX_QT_DND_H_
|
#endif // _WX_QT_DND_H_
|
||||||
|
@@ -71,11 +71,11 @@ public:
|
|||||||
virtual void SetUnderlined( bool underlined );
|
virtual void SetUnderlined( bool underlined );
|
||||||
virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE;
|
virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE;
|
||||||
virtual void SetEncoding(wxFontEncoding encoding);
|
virtual void SetEncoding(wxFontEncoding encoding);
|
||||||
|
|
||||||
wxDECLARE_COMMON_FONT_METHODS();
|
wxDECLARE_COMMON_FONT_METHODS();
|
||||||
|
|
||||||
virtual QFont GetHandle() const;
|
virtual QFont GetHandle() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual wxGDIRefData *CreateGDIRefData() const;
|
virtual wxGDIRefData *CreateGDIRefData() const;
|
||||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||||
|
@@ -16,10 +16,10 @@ public:
|
|||||||
wxFontDialog() { }
|
wxFontDialog() { }
|
||||||
wxFontDialog(wxWindow *parent) { Create(parent); }
|
wxFontDialog(wxWindow *parent) { Create(parent); }
|
||||||
wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); }
|
wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool DoCreate(wxWindow *parent);
|
bool DoCreate(wxWindow *parent);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
wxFontData m_data;
|
wxFontData m_data;
|
||||||
|
@@ -45,7 +45,7 @@ public:
|
|||||||
virtual void SetMenuBar(wxMenuBar *menubar);
|
virtual void SetMenuBar(wxMenuBar *menubar);
|
||||||
virtual void SetStatusBar(wxStatusBar *statusBar );
|
virtual void SetStatusBar(wxStatusBar *statusBar );
|
||||||
virtual void SetToolBar(wxToolBar *toolbar);
|
virtual void SetToolBar(wxToolBar *toolbar);
|
||||||
|
|
||||||
virtual void SetWindowStyleFlag( long style );
|
virtual void SetWindowStyleFlag( long style );
|
||||||
|
|
||||||
virtual void AddChild( wxWindowBase *child );
|
virtual void AddChild( wxWindowBase *child );
|
||||||
|
@@ -51,11 +51,11 @@ public:
|
|||||||
|
|
||||||
virtual bool IsSelected(int n) const wxOVERRIDE;
|
virtual bool IsSelected(int n) const wxOVERRIDE;
|
||||||
virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;
|
virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;
|
||||||
|
|
||||||
virtual unsigned int GetCount() const;
|
virtual unsigned int GetCount() const;
|
||||||
virtual wxString GetString(unsigned int n) const;
|
virtual wxString GetString(unsigned int n) const;
|
||||||
virtual void SetString(unsigned int n, const wxString& s);
|
virtual void SetString(unsigned int n, const wxString& s);
|
||||||
|
|
||||||
virtual int GetSelection() const;
|
virtual int GetSelection() const;
|
||||||
|
|
||||||
virtual QWidget *GetHandle() const;
|
virtual QWidget *GetHandle() const;
|
||||||
@@ -66,16 +66,16 @@ protected:
|
|||||||
virtual void DoSetFirstItem(int n) wxOVERRIDE;
|
virtual void DoSetFirstItem(int n) wxOVERRIDE;
|
||||||
|
|
||||||
virtual void DoSetSelection(int n, bool select) wxOVERRIDE;
|
virtual void DoSetSelection(int n, bool select) wxOVERRIDE;
|
||||||
|
|
||||||
virtual int DoInsertItems(const wxArrayStringsAdapter & items,
|
virtual int DoInsertItems(const wxArrayStringsAdapter & items,
|
||||||
unsigned int pos,
|
unsigned int pos,
|
||||||
void **clientData,
|
void **clientData,
|
||||||
wxClientDataType type);
|
wxClientDataType type);
|
||||||
virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
|
virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
|
||||||
|
|
||||||
virtual void DoSetItemClientData(unsigned int n, void *clientData);
|
virtual void DoSetItemClientData(unsigned int n, void *clientData);
|
||||||
virtual void *DoGetItemClientData(unsigned int n) const;
|
virtual void *DoGetItemClientData(unsigned int n) const;
|
||||||
|
|
||||||
virtual void DoClear();
|
virtual void DoClear();
|
||||||
virtual void DoDeleteOneItem(unsigned int pos);
|
virtual void DoDeleteOneItem(unsigned int pos);
|
||||||
|
|
||||||
|
@@ -75,7 +75,7 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxMDIClientWindow();
|
wxMDIClientWindow();
|
||||||
|
|
||||||
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
|
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
|
||||||
wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
|
wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
|
||||||
};
|
};
|
||||||
|
@@ -25,7 +25,7 @@ public:
|
|||||||
const wxString& name = wxFrameNameStr)
|
const wxString& name = wxFrameNameStr)
|
||||||
{
|
{
|
||||||
return wxFrame::Create(parent, id, title, pos, size,
|
return wxFrame::Create(parent, id, title, pos, size,
|
||||||
style | wxFRAME_TOOL_WINDOW | wxFRAME_NO_TASKBAR,
|
style | wxFRAME_TOOL_WINDOW | wxFRAME_NO_TASKBAR,
|
||||||
name);
|
name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -20,7 +20,7 @@ public:
|
|||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
long style = 0,
|
long style = 0,
|
||||||
const wxString& name = wxNotebookNameStr);
|
const wxString& name = wxNotebookNameStr);
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user