mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-23 23:13:12 +08:00
added font encoding support
some more demos some contributed items into the library many little tweaks and such git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Executable
+11
@@ -0,0 +1,11 @@
|
||||
#!/bin/bash
|
||||
cd src
|
||||
build $*
|
||||
if [ $? != 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd ../modules
|
||||
buildall.py $*
|
||||
cd ..
|
||||
|
||||
@@ -19,6 +19,9 @@ class TestPanel(wxPanel):
|
||||
wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
|
||||
EVT_BUTTON(self, 30, self.OnClick)
|
||||
|
||||
self.testBtn = wxButton(self, 40, "click here", wxPoint(20, 150))
|
||||
EVT_BUTTON(self, 40, self.Test)
|
||||
|
||||
|
||||
def OnClick(self, event):
|
||||
self.log.WriteText("Click! (%d)\n" % event.GetId())
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* FILE : ./html.cpp
|
||||
* FILE : html.cpp
|
||||
*
|
||||
* This file was automatically generated by :
|
||||
* Simplified Wrapper and Interface Generator (SWIG)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* FILE : ./htmlhelp.cpp
|
||||
* FILE : htmlhelp.cpp
|
||||
*
|
||||
* This file was automatically generated by :
|
||||
* Simplified Wrapper and Interface Generator (SWIG)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* FILE : ./oglshapes2.cpp
|
||||
* FILE : oglshapes2.cpp
|
||||
*
|
||||
* This file was automatically generated by :
|
||||
* Simplified Wrapper and Interface Generator (SWIG)
|
||||
@@ -7915,7 +7915,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_size_t","_wxWindowID",0},
|
||||
{ "_size_t","_uint",0},
|
||||
{ "_class_wxRealPoint","_wxRealPoint",0},
|
||||
{ "_wxPrinterDC","_class_wxPrinterDC",0},
|
||||
{ "_class_wxPyShapeEvtHandler","_class_wxPyTextShape",SwigwxPyTextShapeTowxPyShapeEvtHandler},
|
||||
{ "_class_wxPyShapeEvtHandler","_wxPyTextShape",SwigwxPyTextShapeTowxPyShapeEvtHandler},
|
||||
{ "_class_wxPyShapeEvtHandler","_class_wxPyPolygonShape",SwigwxPyPolygonShapeTowxPyShapeEvtHandler},
|
||||
@@ -7935,6 +7934,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxPySizer","_wxPySizer",0},
|
||||
{ "_class_wxPyCompositeShape","_wxPyCompositeShape",0},
|
||||
{ "_wxPyPolygonShape","_class_wxPyPolygonShape",0},
|
||||
{ "_class_wxPostScriptDC","_wxPostScriptDC",0},
|
||||
{ "_wxPanel","_class_wxPanel",0},
|
||||
{ "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
|
||||
{ "_wxCheckBox","_class_wxCheckBox",0},
|
||||
@@ -7985,7 +7985,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxBoxSizer","_class_wxBoxSizer",0},
|
||||
{ "_class___wxPyCleanup","___wxPyCleanup",0},
|
||||
{ "_wxBitmap","_class_wxBitmap",0},
|
||||
{ "_wxTaskBarIcon","_class_wxTaskBarIcon",0},
|
||||
{ "_wxPrintDialog","_class_wxPrintDialog",0},
|
||||
{ "_wxPyControlPoint","_class_wxPyControlPoint",0},
|
||||
{ "_wxPyTimer","_class_wxPyTimer",0},
|
||||
@@ -8053,7 +8052,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_signed_int","_int",0},
|
||||
{ "_class_wxTextCtrl","_wxTextCtrl",0},
|
||||
{ "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
|
||||
{ "_wxMetaFileDC","_class_wxMetaFileDC",0},
|
||||
{ "_wxMenu","_class_wxMenu",0},
|
||||
{ "_class_wxMoveEvent","_wxMoveEvent",0},
|
||||
{ "_wxListBox","_class_wxListBox",0},
|
||||
@@ -8092,7 +8090,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_signed_short","_WXTYPE",0},
|
||||
{ "_signed_short","_short",0},
|
||||
{ "_wxMemoryDC","_class_wxMemoryDC",0},
|
||||
{ "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
|
||||
{ "_class_wxPrintDialog","_wxPrintDialog",0},
|
||||
{ "_class_wxPyControlPoint","_wxPyControlPoint",0},
|
||||
{ "_wxPaintDC","_class_wxPaintDC",0},
|
||||
@@ -8103,6 +8100,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxToolBarTool","_wxToolBarTool",0},
|
||||
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
|
||||
{ "_class_wxCursor","_wxCursor",0},
|
||||
{ "_wxPostScriptDC","_class_wxPostScriptDC",0},
|
||||
{ "_class_wxImageHandler","_wxImageHandler",0},
|
||||
{ "_wxPyShape","_class_wxPyTextShape",SwigwxPyTextShapeTowxPyShape},
|
||||
{ "_wxPyShape","_wxPyTextShape",SwigwxPyTextShapeTowxPyShape},
|
||||
@@ -8118,7 +8116,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxScrolledWindow","_class_wxScrolledWindow",0},
|
||||
{ "_wxTreeItemId","_class_wxTreeItemId",0},
|
||||
{ "_unsigned_char","_byte",0},
|
||||
{ "_class_wxMetaFileDC","_wxMetaFileDC",0},
|
||||
{ "_class_wxMenu","_wxMenu",0},
|
||||
{ "_wxControl","_class_wxControl",0},
|
||||
{ "_class_wxListBox","_wxListBox",0},
|
||||
@@ -8175,7 +8172,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxPyApp","_wxPyApp",0},
|
||||
{ "_wxSize","_class_wxSize",0},
|
||||
{ "_wxRegionIterator","_class_wxRegionIterator",0},
|
||||
{ "_class_wxPrinterDC","_wxPrinterDC",0},
|
||||
{ "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
|
||||
{ "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
|
||||
{ "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},
|
||||
|
||||
@@ -2694,8 +2694,8 @@ static PyObject * wxRect_asTuple(wxRect *self) {
|
||||
PyObject* tup = PyTuple_New(4);
|
||||
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
|
||||
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
|
||||
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->width));
|
||||
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->height));
|
||||
PyTuple_SET_ITEM(tup, 2, PyInt_FromLong(self->width));
|
||||
PyTuple_SET_ITEM(tup, 3, PyInt_FromLong(self->height));
|
||||
return tup;
|
||||
}
|
||||
static PyObject *_wrap_wxRect_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -30,6 +30,65 @@ class wxToolTip(wxToolTipPtr):
|
||||
|
||||
|
||||
|
||||
class wxCaretPtr :
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def __del__(self,misc2c=misc2c):
|
||||
if self.thisown == 1 :
|
||||
misc2c.delete_wxCaret(self)
|
||||
def IsOk(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_IsOk,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def IsVisible(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_IsVisible,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetPositionTuple(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_GetPositionTuple,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetPosition(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_GetPosition,(self,) + _args, _kwargs)
|
||||
if val: val = wxPointPtr(val) ; val.thisown = 1
|
||||
return val
|
||||
def GetSizeTuple(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_GetSizeTuple,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetSize(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_GetSize,(self,) + _args, _kwargs)
|
||||
if val: val = wxSizePtr(val) ; val.thisown = 1
|
||||
return val
|
||||
def GetWindow(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_GetWindow,(self,) + _args, _kwargs)
|
||||
if val: val = wxWindowPtr(val)
|
||||
return val
|
||||
def MoveXY(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_MoveXY,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def Move(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_Move,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def Show(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_Show,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def Hide(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_Hide,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def OnSetFocus(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_OnSetFocus,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def OnKillFocus(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxCaret_OnKillFocus,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def __repr__(self):
|
||||
return "<C wxCaret instance at %s>" % (self.this,)
|
||||
class wxCaret(wxCaretPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(misc2c.new_wxCaret,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#-------------- FUNCTION WRAPPERS ------------------
|
||||
@@ -48,6 +107,10 @@ wxToolTip_Enable = misc2c.wxToolTip_Enable
|
||||
|
||||
wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay
|
||||
|
||||
wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime
|
||||
|
||||
wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime
|
||||
|
||||
|
||||
|
||||
#-------------- VARIABLE WRAPPERS ------------------
|
||||
|
||||
@@ -1709,6 +1709,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxIdleEvent","_class_wxIdleEvent",0},
|
||||
{ "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
|
||||
{ "_wxToolBar","_class_wxToolBar",0},
|
||||
{ "_wxCaret","_class_wxCaret",0},
|
||||
{ "_wxStaticLine","_class_wxStaticLine",0},
|
||||
{ "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0},
|
||||
{ "_wxBrush","_class_wxBrush",0},
|
||||
@@ -1808,6 +1809,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_WXTYPE","_signed_short",0},
|
||||
{ "_WXTYPE","_unsigned_short",0},
|
||||
{ "_wxFileDialog","_class_wxFileDialog",0},
|
||||
{ "_class_wxCaret","_wxCaret",0},
|
||||
{ "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
|
||||
{ "_class_wxBrush","_wxBrush",0},
|
||||
{ "_unsigned_short","_WXTYPE",0},
|
||||
@@ -2034,6 +2036,7 @@ SWIGEXPORT(void) initwxc() {
|
||||
PyDict_SetItemString(d,"wxTB_HORIZONTAL", PyInt_FromLong((long) wxTB_HORIZONTAL));
|
||||
PyDict_SetItemString(d,"wxTB_VERTICAL", PyInt_FromLong((long) wxTB_VERTICAL));
|
||||
PyDict_SetItemString(d,"wxTB_FLAT", PyInt_FromLong((long) wxTB_FLAT));
|
||||
PyDict_SetItemString(d,"wxTB_DOCKABLE", PyInt_FromLong((long) wxTB_DOCKABLE));
|
||||
PyDict_SetItemString(d,"wxCOLOURED", PyInt_FromLong((long) wxCOLOURED));
|
||||
PyDict_SetItemString(d,"wxFIXED_LENGTH", PyInt_FromLong((long) wxFIXED_LENGTH));
|
||||
PyDict_SetItemString(d,"wxALIGN_LEFT", PyInt_FromLong((long) wxALIGN_LEFT));
|
||||
@@ -2247,6 +2250,9 @@ SWIGEXPORT(void) initwxc() {
|
||||
PyDict_SetItemString(d,"wxGROW", PyInt_FromLong((long) wxGROW));
|
||||
PyDict_SetItemString(d,"wxEXPAND", PyInt_FromLong((long) wxEXPAND));
|
||||
PyDict_SetItemString(d,"wxNB_FIXEDWIDTH", PyInt_FromLong((long) wxNB_FIXEDWIDTH));
|
||||
PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT));
|
||||
PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT));
|
||||
PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM));
|
||||
PyDict_SetItemString(d,"wxLI_HORIZONTAL", PyInt_FromLong((long) wxLI_HORIZONTAL));
|
||||
PyDict_SetItemString(d,"wxLI_VERTICAL", PyInt_FromLong((long) wxLI_VERTICAL));
|
||||
PyDict_SetItemString(d,"wxHW_SCROLLBAR_NEVER", PyInt_FromLong((long) wxHW_SCROLLBAR_NEVER));
|
||||
|
||||
@@ -206,6 +206,7 @@ wxTB_3DBUTTONS = wxc.wxTB_3DBUTTONS
|
||||
wxTB_HORIZONTAL = wxc.wxTB_HORIZONTAL
|
||||
wxTB_VERTICAL = wxc.wxTB_VERTICAL
|
||||
wxTB_FLAT = wxc.wxTB_FLAT
|
||||
wxTB_DOCKABLE = wxc.wxTB_DOCKABLE
|
||||
wxCOLOURED = wxc.wxCOLOURED
|
||||
wxFIXED_LENGTH = wxc.wxFIXED_LENGTH
|
||||
wxALIGN_LEFT = wxc.wxALIGN_LEFT
|
||||
@@ -419,6 +420,9 @@ wxSHRINK = wxc.wxSHRINK
|
||||
wxGROW = wxc.wxGROW
|
||||
wxEXPAND = wxc.wxEXPAND
|
||||
wxNB_FIXEDWIDTH = wxc.wxNB_FIXEDWIDTH
|
||||
wxNB_LEFT = wxc.wxNB_LEFT
|
||||
wxNB_RIGHT = wxc.wxNB_RIGHT
|
||||
wxNB_BOTTOM = wxc.wxNB_BOTTOM
|
||||
wxLI_HORIZONTAL = wxc.wxLI_HORIZONTAL
|
||||
wxLI_VERTICAL = wxc.wxLI_VERTICAL
|
||||
wxHW_SCROLLBAR_NEVER = wxc.wxHW_SCROLLBAR_NEVER
|
||||
|
||||
@@ -141,7 +141,11 @@ void __wxPreStart()
|
||||
argv[argc] = NULL;
|
||||
|
||||
gtk_set_locale();
|
||||
#if wxUSE_WCHAR_T
|
||||
if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
|
||||
#else
|
||||
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
|
||||
#endif
|
||||
gtk_init( &argc, &argv );
|
||||
wxSetDetectableAutoRepeat( TRUE );
|
||||
delete [] argv;
|
||||
|
||||
Reference in New Issue
Block a user