AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-01-06 21:34:51 +00:00
parent ef6c08e5c3
commit 33b885b998
9 changed files with 276 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/src/gtk/controls.py
View File

@ -825,6 +825,8 @@ class CheckListBox(ListBox):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
self._setOORInfo(self)
def Create(*args, **kwargs):
"""
Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,

8
wxPython/src/gtk/controls_wrap.cpp
View File

@ -375,7 +375,7 @@ wxString wxTextCtrl_GetString(wxTextCtrl *self,long from,long to){
}
static const wxString wxPyScrollBarNameStr(wxScrollBarNameStr);
static const wxString wxPySPIN_BUTTON_NAME(wxSPIN_BUTTON_NAME);
static const wxString wxPySpinCtrlNameStr(wxT(_T("wxSpinCtrl")));
static const wxString wxPySpinCtrlNameStr(_T("wxSpinCtrl"));
void wxSpinCtrl_SetSelection(wxSpinCtrl *self,long from,long to){
}
static const wxString wxPyRadioBoxNameStr(wxRadioBoxNameStr);
@ -388,7 +388,7 @@ int wxRadioBox_GetNextItem(wxRadioBox const *self,int item,wxDirection dir,long
static const wxString wxPySliderNameStr(wxSliderNameStr);
static const wxString wxPyToggleButtonNameStr(wxT(_T("wxToggleButton")));
static const wxString wxPyToggleButtonNameStr(_T("wxToggleButton"));
#ifdef __WXMAC__
// implement dummy classes and such for wxMac
@ -454,7 +454,7 @@ void wxToolBarBase_SetToolClientData(wxToolBarBase *self,int id,PyObject *client
#include <wx/listctrl.h>
static const wxString wxPyListCtrlNameStr(wxT(_T("wxListCtrl")));
static const wxString wxPyListCtrlNameStr(_T("wxListCtrl"));
void wxListItemAttr_Destroy(wxListItemAttr *self){ delete self; }
// Python aware sorting function for wxPyListCtrl
static int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
@ -558,7 +558,7 @@ wxWindow *wxPyListCtrl_GetMainWindow(wxPyListCtrl *self){
#include <wx/treectrl.h>
#include "wx/wxPython/pytree.h"
static const wxString wxPyTreeCtrlNameStr(wxT(_T("wxTreeCtrl")));
static const wxString wxPyTreeCtrlNameStr(_T("wxTreeCtrl"));
bool wxTreeItemId_operator_ee___(wxTreeItemId *self,wxTreeItemId const *other){
if (!other) return False;
return *self == *other;

250
wxPython/src/gtk/gdi.py
View File

@ -2691,8 +2691,8 @@ class DC(core.Object):
def DrawPolygonList(self, polygons, pens=None, brushes=None):
## Note: This does not currently support fill style or offset
## you can always use the non-List version if need be.
if pens is None:
pens = []
elif isinstance(pens, wx.Pen):
@ -2709,9 +2709,9 @@ class DC(core.Object):
def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None):
## NOTE: this does not currently support changing the font
## Make sure you set Background mode to wxSolid (DC.SetBackgroundMode)
## If you want backgounds to do anything.
if type(textList) == type(''):
textList = [textList]
elif len(textList) != len(coords):
@ -3024,6 +3024,246 @@ class PrinterDCPtr(PrinterDC):
self.__class__ = PrinterDC
_gdi.PrinterDC_swigregister(PrinterDCPtr)
class DC_old(DC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = DC.FloodFillXY
GetPixel = DC.GetPixelXY
DrawLine = DC.DrawLineXY
CrossHair = DC.CrossHairXY
DrawArc = DC.DrawArcXY
DrawCheckMark = DC.DrawCheckMarkXY
DrawEllipticArc = DC.DrawEllipticArcXY
DrawPoint = DC.DrawPointXY
DrawRectangle = DC.DrawRectangleXY
DrawRoundedRectangle = DC.DrawRoundedRectangleXY
DrawCircle = DC.DrawCircleXY
DrawEllipse = DC.DrawEllipseXY
DrawIcon = DC.DrawIconXY
DrawBitmap = DC.DrawBitmapXY
DrawText = DC.DrawTextXY
DrawRotatedText = DC.DrawRotatedTextXY
Blit = DC.BlitXY
class MemoryDC_old(MemoryDC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = MemoryDC.FloodFillXY
GetPixel = MemoryDC.GetPixelXY
DrawLine = MemoryDC.DrawLineXY
CrossHair = MemoryDC.CrossHairXY
DrawArc = MemoryDC.DrawArcXY
DrawCheckMark = MemoryDC.DrawCheckMarkXY
DrawEllipticArc = MemoryDC.DrawEllipticArcXY
DrawPoint = MemoryDC.DrawPointXY
DrawRectangle = MemoryDC.DrawRectangleXY
DrawRoundedRectangle = MemoryDC.DrawRoundedRectangleXY
DrawCircle = MemoryDC.DrawCircleXY
DrawEllipse = MemoryDC.DrawEllipseXY
DrawIcon = MemoryDC.DrawIconXY
DrawBitmap = MemoryDC.DrawBitmapXY
DrawText = MemoryDC.DrawTextXY
DrawRotatedText = MemoryDC.DrawRotatedTextXY
Blit = MemoryDC.BlitXY
class BufferedDC_old(BufferedDC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = BufferedDC.FloodFillXY
GetPixel = BufferedDC.GetPixelXY
DrawLine = BufferedDC.DrawLineXY
CrossHair = BufferedDC.CrossHairXY
DrawArc = BufferedDC.DrawArcXY
DrawCheckMark = BufferedDC.DrawCheckMarkXY
DrawEllipticArc = BufferedDC.DrawEllipticArcXY
DrawPoint = BufferedDC.DrawPointXY
DrawRectangle = BufferedDC.DrawRectangleXY
DrawRoundedRectangle = BufferedDC.DrawRoundedRectangleXY
DrawCircle = BufferedDC.DrawCircleXY
DrawEllipse = BufferedDC.DrawEllipseXY
DrawIcon = BufferedDC.DrawIconXY
DrawBitmap = BufferedDC.DrawBitmapXY
DrawText = BufferedDC.DrawTextXY
DrawRotatedText = BufferedDC.DrawRotatedTextXY
Blit = BufferedDC.BlitXY
class BufferedPaintDC_old(BufferedPaintDC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = BufferedPaintDC.FloodFillXY
GetPixel = BufferedPaintDC.GetPixelXY
DrawLine = BufferedPaintDC.DrawLineXY
CrossHair = BufferedPaintDC.CrossHairXY
DrawArc = BufferedPaintDC.DrawArcXY
DrawCheckMark = BufferedPaintDC.DrawCheckMarkXY
DrawEllipticArc = BufferedPaintDC.DrawEllipticArcXY
DrawPoint = BufferedPaintDC.DrawPointXY
DrawRectangle = BufferedPaintDC.DrawRectangleXY
DrawRoundedRectangle = BufferedPaintDC.DrawRoundedRectangleXY
DrawCircle = BufferedPaintDC.DrawCircleXY
DrawEllipse = BufferedPaintDC.DrawEllipseXY
DrawIcon = BufferedPaintDC.DrawIconXY
DrawBitmap = BufferedPaintDC.DrawBitmapXY
DrawText = BufferedPaintDC.DrawTextXY
DrawRotatedText = BufferedPaintDC.DrawRotatedTextXY
Blit = BufferedPaintDC.BlitXY
class ScreenDC_old(ScreenDC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = ScreenDC.FloodFillXY
GetPixel = ScreenDC.GetPixelXY
DrawLine = ScreenDC.DrawLineXY
CrossHair = ScreenDC.CrossHairXY
DrawArc = ScreenDC.DrawArcXY
DrawCheckMark = ScreenDC.DrawCheckMarkXY
DrawEllipticArc = ScreenDC.DrawEllipticArcXY
DrawPoint = ScreenDC.DrawPointXY
DrawRectangle = ScreenDC.DrawRectangleXY
DrawRoundedRectangle = ScreenDC.DrawRoundedRectangleXY
DrawCircle = ScreenDC.DrawCircleXY
DrawEllipse = ScreenDC.DrawEllipseXY
DrawIcon = ScreenDC.DrawIconXY
DrawBitmap = ScreenDC.DrawBitmapXY
DrawText = ScreenDC.DrawTextXY
DrawRotatedText = ScreenDC.DrawRotatedTextXY
Blit = ScreenDC.BlitXY
class ClientDC_old(ClientDC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = ClientDC.FloodFillXY
GetPixel = ClientDC.GetPixelXY
DrawLine = ClientDC.DrawLineXY
CrossHair = ClientDC.CrossHairXY
DrawArc = ClientDC.DrawArcXY
DrawCheckMark = ClientDC.DrawCheckMarkXY
DrawEllipticArc = ClientDC.DrawEllipticArcXY
DrawPoint = ClientDC.DrawPointXY
DrawRectangle = ClientDC.DrawRectangleXY
DrawRoundedRectangle = ClientDC.DrawRoundedRectangleXY
DrawCircle = ClientDC.DrawCircleXY
DrawEllipse = ClientDC.DrawEllipseXY
DrawIcon = ClientDC.DrawIconXY
DrawBitmap = ClientDC.DrawBitmapXY
DrawText = ClientDC.DrawTextXY
DrawRotatedText = ClientDC.DrawRotatedTextXY
Blit = ClientDC.BlitXY
class PaintDC_old(PaintDC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = PaintDC.FloodFillXY
GetPixel = PaintDC.GetPixelXY
DrawLine = PaintDC.DrawLineXY
CrossHair = PaintDC.CrossHairXY
DrawArc = PaintDC.DrawArcXY
DrawCheckMark = PaintDC.DrawCheckMarkXY
DrawEllipticArc = PaintDC.DrawEllipticArcXY
DrawPoint = PaintDC.DrawPointXY
DrawRectangle = PaintDC.DrawRectangleXY
DrawRoundedRectangle = PaintDC.DrawRoundedRectangleXY
DrawCircle = PaintDC.DrawCircleXY
DrawEllipse = PaintDC.DrawEllipseXY
DrawIcon = PaintDC.DrawIconXY
DrawBitmap = PaintDC.DrawBitmapXY
DrawText = PaintDC.DrawTextXY
DrawRotatedText = PaintDC.DrawRotatedTextXY
Blit = PaintDC.BlitXY
class WindowDC_old(WindowDC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = WindowDC.FloodFillXY
GetPixel = WindowDC.GetPixelXY
DrawLine = WindowDC.DrawLineXY
CrossHair = WindowDC.CrossHairXY
DrawArc = WindowDC.DrawArcXY
DrawCheckMark = WindowDC.DrawCheckMarkXY
DrawEllipticArc = WindowDC.DrawEllipticArcXY
DrawPoint = WindowDC.DrawPointXY
DrawRectangle = WindowDC.DrawRectangleXY
DrawRoundedRectangle = WindowDC.DrawRoundedRectangleXY
DrawCircle = WindowDC.DrawCircleXY
DrawEllipse = WindowDC.DrawEllipseXY
DrawIcon = WindowDC.DrawIconXY
DrawBitmap = WindowDC.DrawBitmapXY
DrawText = WindowDC.DrawTextXY
DrawRotatedText = WindowDC.DrawRotatedTextXY
Blit = WindowDC.BlitXY
class MirrorDC_old(MirrorDC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = MirrorDC.FloodFillXY
GetPixel = MirrorDC.GetPixelXY
DrawLine = MirrorDC.DrawLineXY
CrossHair = MirrorDC.CrossHairXY
DrawArc = MirrorDC.DrawArcXY
DrawCheckMark = MirrorDC.DrawCheckMarkXY
DrawEllipticArc = MirrorDC.DrawEllipticArcXY
DrawPoint = MirrorDC.DrawPointXY
DrawRectangle = MirrorDC.DrawRectangleXY
DrawRoundedRectangle = MirrorDC.DrawRoundedRectangleXY
DrawCircle = MirrorDC.DrawCircleXY
DrawEllipse = MirrorDC.DrawEllipseXY
DrawIcon = MirrorDC.DrawIconXY
DrawBitmap = MirrorDC.DrawBitmapXY
DrawText = MirrorDC.DrawTextXY
DrawRotatedText = MirrorDC.DrawRotatedTextXY
Blit = MirrorDC.BlitXY
class PostScriptDC_old(PostScriptDC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = PostScriptDC.FloodFillXY
GetPixel = PostScriptDC.GetPixelXY
DrawLine = PostScriptDC.DrawLineXY
CrossHair = PostScriptDC.CrossHairXY
DrawArc = PostScriptDC.DrawArcXY
DrawCheckMark = PostScriptDC.DrawCheckMarkXY
DrawEllipticArc = PostScriptDC.DrawEllipticArcXY
DrawPoint = PostScriptDC.DrawPointXY
DrawRectangle = PostScriptDC.DrawRectangleXY
DrawRoundedRectangle = PostScriptDC.DrawRoundedRectangleXY
DrawCircle = PostScriptDC.DrawCircleXY
DrawEllipse = PostScriptDC.DrawEllipseXY
DrawIcon = PostScriptDC.DrawIconXY
DrawBitmap = PostScriptDC.DrawBitmapXY
DrawText = PostScriptDC.DrawTextXY
DrawRotatedText = PostScriptDC.DrawRotatedTextXY
Blit = PostScriptDC.BlitXY
class MetaFileDC_old(MetaFileDC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = MetaFileDC.FloodFillXY
GetPixel = MetaFileDC.GetPixelXY
DrawLine = MetaFileDC.DrawLineXY
CrossHair = MetaFileDC.CrossHairXY
DrawArc = MetaFileDC.DrawArcXY
DrawCheckMark = MetaFileDC.DrawCheckMarkXY
DrawEllipticArc = MetaFileDC.DrawEllipticArcXY
DrawPoint = MetaFileDC.DrawPointXY
DrawRectangle = MetaFileDC.DrawRectangleXY
DrawRoundedRectangle = MetaFileDC.DrawRoundedRectangleXY
DrawCircle = MetaFileDC.DrawCircleXY
DrawEllipse = MetaFileDC.DrawEllipseXY
DrawIcon = MetaFileDC.DrawIconXY
DrawBitmap = MetaFileDC.DrawBitmapXY
DrawText = MetaFileDC.DrawTextXY
DrawRotatedText = MetaFileDC.DrawRotatedTextXY
Blit = MetaFileDC.BlitXY
class PrinterDC_old(PrinterDC):
"""DC class that has methods with 2.4 compatible parameters."""
FloodFill = PrinterDC.FloodFillXY
GetPixel = PrinterDC.GetPixelXY
DrawLine = PrinterDC.DrawLineXY
CrossHair = PrinterDC.CrossHairXY
DrawArc = PrinterDC.DrawArcXY
DrawCheckMark = PrinterDC.DrawCheckMarkXY
DrawEllipticArc = PrinterDC.DrawEllipticArcXY
DrawPoint = PrinterDC.DrawPointXY
DrawRectangle = PrinterDC.DrawRectangleXY
DrawRoundedRectangle = PrinterDC.DrawRoundedRectangleXY
DrawCircle = PrinterDC.DrawCircleXY
DrawEllipse = PrinterDC.DrawEllipseXY
DrawIcon = PrinterDC.DrawIconXY
DrawBitmap = PrinterDC.DrawBitmapXY
DrawText = PrinterDC.DrawTextXY
DrawRotatedText = PrinterDC.DrawRotatedTextXY
Blit = PrinterDC.BlitXY
#---------------------------------------------------------------------------
IMAGELIST_DRAW_NORMAL = _gdi.IMAGELIST_DRAW_NORMAL

2
wxPython/src/gtk/gdi_wrap.cpp
View File

@ -590,7 +590,7 @@ class wxPrinterDC : public wxClientDC {
public:
wxPrinterDC(const wxPrintData&)
{ wxPyRaiseNotImplemented(); }
// wxPrinterDC(const wxString&, const wxString&, const wxString&, bool, int)
// { wxPyRaiseNotImplemented(); }
};

4
wxPython/src/gtk/grid.py
View File

@ -1224,6 +1224,10 @@ class Grid(windows.ScrolledWindow):
wxGridSelectCells = _grid.Grid_wxGridSelectCells
wxGridSelectRows = _grid.Grid_wxGridSelectRows
wxGridSelectColumns = _grid.Grid_wxGridSelectColumns
SelectCells = wxGridSelectCells
SelectRows = wxGridSelectRows
SelectColumns = wxGridSelectColumns,
def CreateGrid(*args, **kwargs):
"""CreateGrid(int numRows, int numCols, WXGRIDSELECTIONMODES selmode=wxGridSelectCells) -> bool"""
return _grid.Grid_CreateGrid(*args, **kwargs)

2
wxPython/src/gtk/grid_wrap.cpp
View File

@ -282,7 +282,7 @@ static swig_type_info *swig_types[52];
static const wxString wxPyEmptyString(wxEmptyString);
static const wxString wxPyPanelNameStr(wxPanelNameStr);
static const wxString wxPyDateTimeFormatStr(wxT(wxT("%c")));
static const wxString wxPyDateTimeFormatStr(wxT("%c"));
#define wxPyMake_TEMPLATE(TYPE) \

4
wxPython/src/gtk/misc_wrap.cpp
View File

@ -850,8 +850,8 @@ bool wxConfigBase_ReadBool(wxConfigBase *self,wxString const &key,bool defaultVa
#include <wx/datetime.h>
static const wxString wxPyDateFormatStr(wxT(wxT("%c")));
static const wxString wxPyTimeSpanFormatStr(wxT(wxT("%H:%M:%S")));
static const wxString wxPyDateFormatStr(wxT("%c"));
static const wxString wxPyTimeSpanFormatStr(wxT("%H:%M:%S"));
#define LOCAL_TZ wxDateTime::Local

10
wxPython/src/gtk/windows_wrap.cpp
View File

@ -356,9 +356,9 @@ wxRect wxStatusBar_GetFieldRect(wxStatusBar *self,int i){
self->GetFieldRect(i, r);
return r;
}
static const wxString wxPySplitterNameStr(wxT(wxT("splitter")));
static const wxString wxPySashNameStr(wxT(wxT("sashWindow")));
static const wxString wxPySashLayoutNameStr(wxT(wxT("layoutWindow")));
static const wxString wxPySplitterNameStr(wxT("splitter"));
static const wxString wxPySashNameStr(wxT("sashWindow"));
static const wxString wxPySashLayoutNameStr(wxT("layoutWindow"));
#include <wx/popupwin.h>
@ -782,8 +782,8 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild);
#include "wx/wxPython/printfw.h"
static const wxString wxPyPrintoutTitleStr(wxT(wxT("Printout")));
static const wxString wxPyPreviewCanvasNameStr(wxT(wxT("previewcanvas")));
static const wxString wxPyPrintoutTitleStr(wxT("Printout"));
static const wxString wxPyPreviewCanvasNameStr(wxT("previewcanvas"));

12
wxPython/wxPython/gdi.py
View File

@ -535,5 +535,17 @@ wxTheBrushList = wx.gdi.TheBrushList
wxTheColourDatabase = wx.gdi.TheColourDatabase
wxEffects = wx.gdi.Effects
wxEffectsPtr = wx.gdi.EffectsPtr
wxDC_old = wx.gdi.DC_old
wxMemoryDC_old = wx.gdi.MemoryDC_old
wxBufferedDC_old = wx.gdi.BufferedDC_old
wxBufferedPaintDC_old = wx.gdi.BufferedPaintDC_old
wxScreenDC_old = wx.gdi.ScreenDC_old
wxClientDC_old = wx.gdi.ClientDC_old
wxPaintDC_old = wx.gdi.PaintDC_old
wxWindowDC_old = wx.gdi.WindowDC_old
wxMirrorDC_old = wx.gdi.MirrorDC_old
wxPostScriptDC_old = wx.gdi.PostScriptDC_old
wxMetaFileDC_old = wx.gdi.MetaFileDC_old
wxPrinterDC_old = wx.gdi.PrinterDC_old