|
From: shelarcy <she...@gm...> - 2009-03-10 06:13:21
|
DarcsURL: C:/home/shelarcy/wxhaskell
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"
--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Tue Mar 10 14:38:38 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc=
y...@gm...>
* Refactor to return wxPoint/wxSize/wxRect class directly in wxc.
We accept to return wxPoint, wxSize and wxRect class directly in wxc, now=
.
=
We always used passing int* pointer arguments to return Point, Size and R=
ect
type, previously. But this convention is complex. We sometimes mistook to
return wxPoint, wxSize and wxRect. Its mistake causes problems.
=
So, we accept to return wxPoint, wxSize and wxRect now. And we refactor s=
ome
old code to return these types, to show we can return these types now.
--=_
Content-Type: text/x-darcs-patch; name="refactor-to-return-wxpoint_wxsize_wxrect-class-directly-in-wxc_.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!
New patches:
[Refactor to return wxPoint/wxSize/wxRect class directly in wxc.
shelarcy <she...@gm...>**20090310053838
Ignore-this: e414ff89344e856a3f61a0e6f318c427
We accept to return wxPoint, wxSize and wxRect class directly in wxc, now.
=
We always used passing int* pointer arguments to return Point, Size and Re=
ct
type, previously. But this convention is complex. We sometimes mistook to
return wxPoint, wxSize and wxRect. Its mistake causes problems.
=
So, we accept to return wxPoint, wxSize and wxRect now. And we refactor so=
me
old code to return these types, to show we can return these types now.
] {
hunk ./wxc/include/dragimage.h 21
TBool wxDragImage_BeginDrag(TSelf(wxDragImage) self, int x, int y, TClass=
(wxWindow) window, TClass(wxWindow) boundingWindow );=0D
TBool wxGenericDragImage_DoDrawImage(TSelf(wxGenericDragImage) self, TCla=
ss(wxDC) dc, int x, int y );=0D
void wxDragImage_EndDrag(TSelf(wxDragImage) self );=0D
-void wxGenericDragImage_GetImageRect(TSelf(wxGenericDragImage) self, int =
x_pos, int y_pos, int* x, int* y, int* w, int* h );=0D
+TClass(wxRect) wxGenericDragImage_GetImageRect(TSelf(wxGenericDragImage) s=
elf, int x_pos, int y_pos );=0D
TBool wxDragImage_Hide(TSelf(wxDragImage) self );=0D
TBool wxDragImage_Move(TSelf(wxDragImage) self, int x, int y );=0D
TBool wxDragImage_Show(TSelf(wxDragImage) self );=0D
hunk ./wxc/include/mediactrl.h 8
=0D
TClass(wxMediaCtrl) wxMediaCtrl_Create( TClass(wxWindow) parent, int wind=
owID, TClass(wxString) fileName, int x, int y, int w, int h, long style, TC=
lass(wxString) szBackend, TClass(wxString) name );=0D
void wxMediaCtrl_Delete(TSelf(wxMediaCtrl) self);=0D
-void wxMediaCtrl_GetBestSize(TSelf(wxMediaCtrl) self, int* w, int* h );=
=0D
+TClass(wxSize) wxMediaCtrl_GetBestSize(TSelf(wxMediaCtrl) self );=0D
double wxMediaCtrl_GetPlaybackRate(TSelf(wxMediaCtrl) self);=0D
double wxMediaCtrl_GetVolume(TSelf(wxMediaCtrl) self);=0D
int wxMediaCtrl_GetState(TSelf(wxMediaCtrl) self);=0D
hunk ./wxc/include/wxc.h 83
int wxMouseEvent_GetButton( TSelf(wxMouseEvent) _obj );
int expEVT_MOUSEWHEEL( );
=0D
-void wxcGetMousePosition( TPointOut(x,y) );=0D
+TClass(wxPoint) wxcGetMousePosition( );=0D
=0D
=0D
/* wxDC */=0D
hunk ./wxc/include/wxc.h 91
double wxDC_GetUserScaleY( TSelf(wxDC) dc );=0D
=
/* wxWindow */
-void wxWindow_ConvertDialogToPixelsEx( TSelf(wxWindow) _obj, TPoint(x,y),=
TPointOut(_x,_y) );
-void wxWindow_ConvertPixelsToDialogEx( TSelf(wxWindow) _obj, TPoint(x,y),=
TPointOut(_x,_y) );
-void wxWindow_ScreenToClient2(TSelf(wxWindow) self, TPoint(x,y), TPointOu=
t(cx,cy));=0D
+TClass(wxPoint) wxWindow_ConvertDialogToPixelsEx( TSelf(wxWindow) _obj );=
=0D
+TClass(wxPoint) wxWindow_ConvertPixelsToDialogEx( TSelf(wxWindow) _obj );=
=0D
+TClass(wxPoint) wxWindow_ScreenToClient2( TSelf(wxWindow) _obj, TPoint(x,y=
) );=0D
=0D
/* wxString helpers */=0D
TClass(wxString) wxString_Create( TString buffer );=0D
hunk ./wxc/include/wxc.h 121
void wxListCtrl_AssignImageList( TSelf(wxListCtrl) _obj, TClass(wxImageLis=
t) images, int which );=0D
void wxListCtrl_GetColumn2( TSelf(wxListCtrl) _obj, int col, TClassRef(wxL=
istItem) item);=0D
void wxListCtrl_GetItem2( TSelf(wxListCtrl) _obj, TClassRef(wxListItem) in=
fo);=0D
-void wxListCtrl_GetItemPosition2( TSelf(wxListCtrl) _obj, int item, TPoint=
Out(x,y));=0D
+TClass(wxPoint) wxListCtrl_GetItemPosition2( TSelf(wxListCtrl) _obj, int i=
tem );=0D
/** Sort items in a list control. Takes a closure that is called with a 'C=
ommandEvent' where the @Int@ is the item data of the first item and the @Ex=
traLong@ the item data of the second item. The event handler should set the=
@Int@ to 0 when the items are equal, -1 when the first is less, and 1 when=
the second is less. */=0D
TBool wxListCtrl_SortItems2(TSelf(wxListCtrl) _obj, TClass(wxClosure) clos=
ure );=0D
=0D
hunk ./wxc/include/wxc.h 200
=
/* Progress dialog */
TClass(wxProgressDialog) wxProgressDialog_Create( TClass(wxString) title, =
TClass(wxString) message, int max, TClass(wxWindow) parent, int style );
-int wxProgressDialog_Update(TSelf(wxProgressDialog) obj, int value );
-int wxProgressDialog_UpdateWithMessage( TSelf(wxProgressDialog) obj, int =
value, TClass(wxString) message );
+TBool wxProgressDialog_Update(TSelf(wxProgressDialog) obj, int value );
+TBool wxProgressDialog_UpdateWithMessage( TSelf(wxProgressDialog) obj, int=
value, TClass(wxString) message );
void wxProgressDialog_Resume( TSelf(wxProgressDialog) obj );
=
/** Get the version number of wxWindows as a number composed of the major =
version times 1000, minor version times 100, and the release number. For ex=
ample, release 2.1.15 becomes 2115. */
hunk ./wxc/include/wxc.h 249
/** Return the /href/ attribute of the associated html anchor (if applicab=
le) */
TClass(wxString) wxcHtmlEvent_GetHref( TSelf(wxcHtmlEvent) self );
TClass(wxString) wxcHtmlEvent_GetTarget( TSelf(wxcHtmlEvent) self );
-void wxcHtmlEvent_GetLogicalPosition( TSelf(wxcHtmlEvent) =
self, TPointOut(x,y) );
+TClass(wxPoint) wxcHtmlEvent_GetLogicalPosition( TSelf(wxcHtmlEvent) =
self );
=
/* html window */
TClassDefExtend(wxcHtmlWindow,wxHtmlWindow)
hunk ./wxc/include/wxc.h 285
TClass(wxLogStderr) wxLogStderr_CreateStdOut();
TClass(wxLogNull) wxLogNull_Create();
TClass(wxLogTextCtrl) wxLogTextCtrl_Create( TClass(wxTextCtrl) text );
-TClass(wxLogWindow) wxLogWindow_Create( TClass(wxWindow) parent, TString=
title, TBoolInt showit, TBoolInt passthrough );
+TClass(wxLogWindow) wxLogWindow_Create( TClass(wxWindow) parent, TString=
title, TBool showit, TBool passthrough );
TClass(wxFrame) wxLogWindow_GetFrame( TSelf(wxLogWindow) obj );
=
void LogError(TClass(wxString) _msg);
hunk ./wxc/include/wxc_glue.h 367
void ELJApp_Bell( );=0D
TClass(ELJLog) ELJApp_CreateLogTarget( );=0D
void ELJApp_Dispatch( );=0D
-void ELJApp_DisplaySize( TSizeOutVoid(_w,_h) );=0D
+TClass(wxSize) ELJApp_DisplaySize( );=0D
void ELJApp_EnableTooltips( TBool _enable );=0D
void ELJApp_EnableTopLevelWindows( int _enb );=0D
int ELJApp_ExecuteProcess( TClass(wxString) _cmd, int _snc, TClass(=
wxProcess) _prc );=0D
hunk ./wxc/include/wxc_glue.h 392
void ELJApp_InitAllImageHandlers( );=0D
TBool ELJApp_Initialized( );=0D
int ELJApp_MainLoop( );=0D
-void ELJApp_MousePosition( TPointOutVoid(_x,_y) );=0D
+TClass(wxPoint) ELJApp_MousePosition( );=0D
int ELJApp_Pending( );=0D
int ELJApp_SafeYield( TClass(wxWindow) _win );=0D
/* int ELJApp_SendIdleEvents( ); */=0D
hunk ./wxc/include/wxc_glue.h 1011
=0D
/* wxBoxSizer */=0D
TClassDefExtend(wxBoxSizer,wxSizer)=0D
-void wxBoxSizer_CalcMin( TSelf(wxBoxSizer) _obj, TSizeOutVoid(_w,_h)=
);=0D
+TClass(wxSize) wxBoxSizer_CalcMin( TSelf(wxBoxSizer) _obj );=0D
TClass(wxBoxSizer) wxBoxSizer_Create( int orient );=0D
int wxBoxSizer_GetOrientation( TSelf(wxBoxSizer) _obj );=0D
void wxBoxSizer_RecalcSizes( TSelf(wxBoxSizer) _obj );=0D
hunk ./wxc/include/wxc_glue.h 1079
TClassDefExtend(wxCalculateLayoutEvent,wxEvent)=0D
TClass(wxCalculateLayoutEvent) wxCalculateLayoutEvent_Create( int id );=0D
int wxCalculateLayoutEvent_GetFlags( TSelf(wxCalculateLayoutEvent) =
_obj );=0D
-void wxCalculateLayoutEvent_GetRect( TSelf(wxCalculateLayoutEvent) _=
obj, TRectOutVoid(_x,_y,_w,_h) );=0D
+TClass(wxRect) wxCalculateLayoutEvent_GetRect( TSelf(wxCalculateLayoutEven=
t) _obj );=0D
void wxCalculateLayoutEvent_SetFlags( TSelf(wxCalculateLayoutEvent) =
_obj, int flags );=0D
void wxCalculateLayoutEvent_SetRect( TSelf(wxCalculateLayoutEvent) _=
obj, TRect(x,y,w,h) );=0D
=0D
hunk ./wxc/include/wxc_glue.h 1138
TClassDef(wxCaret)=0D
TClass(wxCaret) wxCaret_Create( TClass(wxWindow) _wnd, int _wth, int _hgt =
);=0D
int wxCaret_GetBlinkTime( );=0D
-void wxCaret_GetPosition( TSelf(wxCaret) _obj, TPointOutVoid(_x,_y) =
);=0D
-void wxCaret_GetSize( TSelf(wxCaret) _obj, TSizeOutVoid(_w,_h) );=0D
+TClass(wxPoint) wxCaret_GetPosition( TSelf(wxCaret) _obj );=0D
+TClass(wxSize) wxCaret_GetSize( TSelf(wxCaret) _obj );=0D
TClass(wxWindow) wxCaret_GetWindow( TSelf(wxCaret) _obj );=0D
void wxCaret_Hide( TSelf(wxCaret) _obj );=0D
TBool wxCaret_IsOk( TSelf(wxCaret) _obj );=0D
hunk ./wxc/include/wxc_glue.h 1455
void wxDC_DrawEllipticArc( TSelf(wxDC) _obj, TRect(x,y,w,h), double =
sa, double ea );=0D
void wxDC_DrawIcon( TSelf(wxDC) _obj, TClass(wxIcon) icon, TPoint(x,=
y) );=0D
void wxDC_DrawLabel( TSelf(wxDC) _obj, TClass(wxString) str, TRect(x=
,y,w,h), int align, int indexAccel);=0D
-void wxDC_DrawLabelBitmap( TSelf(wxDC) _obj, TClass(wxString) str, T=
Class(wxBitmap) bmp, TRect(x,y,w,h), int align, int indexAccel, int *_x, in=
t *_y, int *_w, int *_h );=0D
+TClass(wxRect) wxDC_DrawLabelBitmap( TSelf(wxDC) _obj, TClass(wxString) st=
r, TClass(wxBitmap) bmp, TRect(x,y,w,h), int align, int indexAccel );=0D
void wxDC_DrawLine( TSelf(wxDC) _obj, TPoint(x1,y1), TPoint(x2,y2) )=
;=0D
void wxDC_DrawLines( TSelf(wxDC) _obj, int n, void* x, void* y, TPoi=
nt(xoffset,yoffset) );=0D
void wxDC_DrawPoint( TSelf(wxDC) _obj, TPoint(x,y) );=0D
hunk ./wxc/include/wxc_glue.h 1480
void wxDC_GetFont( TSelf(wxDC) _obj, TClassRef(wxFont) _ref );=0D
int wxDC_GetLogicalFunction( TSelf(wxDC) _obj );=0D
void wxDC_GetLogicalOrigin( TSelf(wxDC) _obj, TPointOutVoid(_x,_y) )=
;=0D
-void wxDC_GetLogicalScale( TSelf(wxDC) _obj, TPointOutVoid(_x,_y) );=
=0D
+void wxDC_GetLogicalScale( TSelf(wxDC) _obj, TSizeOutDouble(_x,_y) )=
;=0D
int wxDC_GetMapMode( TSelf(wxDC) _obj );=0D
hunk ./wxc/include/wxc_glue.h 1482
-void wxDC_GetPPI( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );=0D
+TClass(wxSize) wxDC_GetPPI( TSelf(wxDC) _obj );=0D
void wxDC_GetPen( TSelf(wxDC) _obj, TClassRef(wxPen) _ref );=0D
hunk ./wxc/include/wxc_glue.h 1484
-TBoolInt wxDC_GetPixel( TSelf(wxDC) _obj, TPoint(x,y), TClass(wxColour) =
col );=0D
-void wxDC_GetSize( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );=0D
-void wxDC_GetSizeMM( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );=0D
+TBool wxDC_GetPixel( TSelf(wxDC) _obj, TPoint(x,y), TClass(wxColour) =
col );=0D
+TClass(wxSize) wxDC_GetSize( TSelf(wxDC) _obj );=0D
+TClass(wxSize) wxDC_GetSizeMM( TSelf(wxDC) _obj );=0D
void wxDC_GetTextBackground( TSelf(wxDC) _obj, TClassRef(wxColour) _=
ref );=0D
void wxDC_GetTextExtent( TSelf(wxDC) self, TClass(wxString) string, =
void* w, void* h, void* descent, void* externalLeading, TClass(wxFont) theF=
ont );=0D
void wxDC_GetMultiLineTextExtent( TSelf(wxDC) self, TClass(wxString)=
string, void* w, void* h, void* heightLine, TClass(wxFont) theFont );=0D
hunk ./wxc/include/wxc_glue.h 1491
void wxDC_GetTextForeground( TSelf(wxDC) _obj, TClassRef(wxColour) _=
ref );=0D
-void wxDC_GetUserScale( TSelf(wxDC) _obj, void* x, void* y );=0D
+void wxDC_GetUserScale( TSelf(wxDC) _obj, TSizeOutDouble(x, y) );=0D
int wxDC_LogicalToDeviceX( TSelf(wxDC) _obj, int x );=0D
int wxDC_LogicalToDeviceXRel( TSelf(wxDC) _obj, int x );=0D
int wxDC_LogicalToDeviceY( TSelf(wxDC) _obj, int y );=0D
hunk ./wxc/include/wxc_glue.h 1885
TBool wxEvtHandler_GetEvtHandlerEnabled( TSelf(wxEvtHandler) _obj );=
=0D
TClass(wxEvtHandler) wxEvtHandler_GetNextHandler( TSelf(wxEvtHandler) _obj=
);=0D
TClass(wxEvtHandler) wxEvtHandler_GetPreviousHandler( TSelf(wxEvtHandler) =
_obj );=0D
-int wxEvtHandler_ProcessEvent( TSelf(wxEvtHandler) _obj, TClass(wxE=
vent) event );=0D
+TBool wxEvtHandler_ProcessEvent( TSelf(wxEvtHandler) _obj, TClass(wxE=
vent) event );=0D
void wxEvtHandler_ProcessPendingEvents( TSelf(wxEvtHandler) _obj );=
=0D
void wxEvtHandler_SetEvtHandlerEnabled( TSelf(wxEvtHandler) _obj, TB=
ool enabled );=0D
void wxEvtHandler_SetNextHandler( TSelf(wxEvtHandler) _obj, TClass(w=
xEvtHandler) handler );=0D
hunk ./wxc/include/wxc_glue.h 2019
TClassDefExtend(wxFlexGridSizer,wxGridSizer)=0D
void wxFlexGridSizer_AddGrowableCol( TSelf(wxFlexGridSizer) _obj, si=
ze_t idx );=0D
void wxFlexGridSizer_AddGrowableRow( TSelf(wxFlexGridSizer) _obj, si=
ze_t idx );=0D
-void wxFlexGridSizer_CalcMin( TSelf(wxFlexGridSizer) _obj, TSizeOutV=
oid(_w,_h) );=0D
+TClass(wxSize) wxFlexGridSizer_CalcMin( TSelf(wxFlexGridSizer) _obj );=0D
TClass(wxFlexGridSizer) wxFlexGridSizer_Create( int rows, int cols, int vg=
ap, int hgap );=0D
void wxFlexGridSizer_RecalcSizes( TSelf(wxFlexGridSizer) _obj );=0D
void wxFlexGridSizer_RemoveGrowableCol( TSelf(wxFlexGridSizer) _obj,=
size_t idx );=0D
hunk ./wxc/include/wxc_glue.h 2204
void wxGrid_AutoSizeRow( TSelf(wxGrid) _obj, int row, TBoolInt setAs=
Min );=0D
void wxGrid_AutoSizeRows( TSelf(wxGrid) _obj, TBoolInt setAsMin );=
=0D
void wxGrid_BeginBatch( TSelf(wxGrid) _obj );=0D
-void wxGrid_BlockToDeviceRect( TSelf(wxGrid) _obj, int top, int left=
, int bottom, int right, TRectOut(_x,_y,_w,_h) );=0D
+TClass(wxRect) wxGrid_BlockToDeviceRect( TSelf(wxGrid) _obj, int top, int =
left, int bottom, int right );=0D
void wxGrid_CalcCellsExposed( TSelf(wxGrid) _obj, TClass(wxRegion) r=
eg );=0D
void wxGrid_CalcColLabelsExposed( TSelf(wxGrid) _obj, TClass(wxRegio=
n) reg );=0D
void wxGrid_CalcRowLabelsExposed( TSelf(wxGrid) _obj, TClass(wxRegio=
n) reg );=0D
hunk ./wxc/include/wxc_glue.h 2212
TBool wxGrid_CanDragGridSize( TSelf(wxGrid) _obj );=0D
TBool wxGrid_CanDragRowSize( TSelf(wxGrid) _obj );=0D
TBool wxGrid_CanEnableCellControl( TSelf(wxGrid) _obj );=0D
-void wxGrid_CellToRect( TSelf(wxGrid) _obj, int row, int col, TRectO=
ut(_x,_y,_w,_h) );=0D
+TClass(wxRect) wxGrid_CellToRect( TSelf(wxGrid) _obj, int row, int col )=
=0D
void wxGrid_ClearGrid( TSelf(wxGrid) _obj );=0D
void wxGrid_ClearSelection( TSelf(wxGrid) _obj );=0D
TClass(wxGrid) wxGrid_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_=
top,_wdt,_hgt), int _stl );=0D
hunk ./wxc/include/wxc_glue.h 2485
TBool wxGridEvent_AltDown (TSelf(wxGridEvent) _obj);=0D
TBool wxGridEvent_ControlDown (TSelf(wxGridEvent) _obj);=0D
int wxGridEvent_GetCol (TSelf(wxGridEvent) _obj);=0D
-void wxGridEvent_GetPosition (TSelf(wxGridEvent) _obj, TPointOutVoid=
(x,y));=0D
+TClass(wxPoint) wxGridEvent_GetPosition (TSelf(wxGridEvent) _obj);=0D
int wxGridEvent_GetRow (TSelf(wxGridEvent) _obj);=0D
TBool wxGridEvent_MetaDown (TSelf(wxGridEvent) _obj);=0D
TBool wxGridEvent_Selecting (TSelf(wxGridEvent) _obj);=0D
hunk ./wxc/include/wxc_glue.h 2508
/* wxGridSizeEvent */=0D
TClassDefExtend(wxGridSizeEvent,wxNotifyEvent)=0D
int wxGridSizeEvent_GetRowOrCol (TSelf(wxGridSizeEvent) _obj);=0D
-void wxGridSizeEvent_GetPosition (TSelf(wxGridSizeEvent) _obj, TPoin=
tOutVoid(x,y));=0D
+TClass(wxPoint) wxGridSizeEvent_GetPosition (TSelf(wxGridSizeEvent) _obj);=
=0D
TBool wxGridSizeEvent_ControlDown (TSelf(wxGridSizeEvent) _obj);=0D
TBool wxGridSizeEvent_MetaDown (TSelf(wxGridSizeEvent) _obj);=0D
TBool wxGridSizeEvent_ShiftDown (TSelf(wxGridSizeEvent) _obj);=0D
hunk ./wxc/include/wxc_glue.h 2517
=0D
/* wxGridSizer */=0D
TClassDefExtend(wxGridSizer,wxSizer)=0D
-void wxGridSizer_CalcMin( TSelf(wxGridSizer) _obj, TSizeOutVoid(_w,_=
h) );=0D
+TClass(wxSize) wxGridSizer_CalcMin( TSelf(wxGridSizer) _obj );=0D
TClass(wxGridSizer) wxGridSizer_Create( int rows, int cols, int vgap, int =
hgap );=0D
int wxGridSizer_GetCols( TSelf(wxGridSizer) _obj );=0D
int wxGridSizer_GetHGap( TSelf(wxGridSizer) _obj );=0D
hunk ./wxc/include/wxc_glue.h 2553
/* wxHelpEvent */=0D
TClassDefExtend(wxHelpEvent,wxCommandEvent)=0D
TClass(wxString) wxHelpEvent_GetLink( TSelf(wxHelpEvent) _obj );=0D
-void wxHelpEvent_GetPosition( TSelf(wxHelpEvent) _obj, TPointOutVoid=
(_x,_y) );=0D
+TClass(wxPoint) wxHelpEvent_GetPosition( TSelf(wxHelpEvent) _obj );=0D
TClass(wxString) wxHelpEvent_GetTarget( TSelf(wxHelpEvent) _obj );=0D
void wxHelpEvent_SetLink( TSelf(wxHelpEvent) _obj, TClass(wxString) =
link );=0D
void wxHelpEvent_SetPosition( TSelf(wxHelpEvent) _obj, TPoint(x,y) )=
;=0D
hunk ./wxc/include/wxc_glue.h 2820
int wxJoystick_GetPOVPosition( TSelf(wxJoystick) _obj );=0D
int wxJoystick_GetPollingMax( TSelf(wxJoystick) _obj );=0D
int wxJoystick_GetPollingMin( TSelf(wxJoystick) _obj );=0D
-void wxJoystick_GetPosition( TSelf(wxJoystick) _obj, TPointOutVoid(_=
x,_y) );=0D
+TClass(wxPoint) wxJoystick_GetPosition( TSelf(wxJoystick) _obj );=0D
int wxJoystick_GetProductId( TSelf(wxJoystick) _obj );=0D
TClass(wxString) wxJoystick_GetProductName( TSelf(wxJoystick) _obj );=0D
int wxJoystick_GetRudderMax( TSelf(wxJoystick) _obj );=0D
hunk ./wxc/include/wxc_glue.h 2860
int wxJoystickEvent_GetButtonChange( TSelf(wxJoystickEvent) _obj );=
=0D
int wxJoystickEvent_GetButtonState( TSelf(wxJoystickEvent) _obj );=
=0D
int wxJoystickEvent_GetJoystick( TSelf(wxJoystickEvent) _obj );=0D
-void wxJoystickEvent_GetPosition( TSelf(wxJoystickEvent) _obj, TPoin=
tOut(_x,_y) );=0D
+TClass(wxPoint) wxJoystickEvent_GetPosition( TSelf(wxJoystickEvent) _obj )=
;=0D
int wxJoystickEvent_GetZPosition( TSelf(wxJoystickEvent) _obj );=0D
TBool wxJoystickEvent_IsButton( TSelf(wxJoystickEvent) _obj );=0D
TBool wxJoystickEvent_IsMove( TSelf(wxJoystickEvent) _obj );=0D
hunk ./wxc/include/wxc_glue.h 2868
void wxJoystickEvent_SetButtonChange( TSelf(wxJoystickEvent) _obj, i=
nt change );=0D
void wxJoystickEvent_SetButtonState( TSelf(wxJoystickEvent) _obj, in=
t state );=0D
void wxJoystickEvent_SetJoystick( TSelf(wxJoystickEvent) _obj, int s=
tick );=0D
-void wxJoystickEvent_SetPosition( TSelf(wxJoystickEvent) _obj, void*=
pos );=0D
+void wxJoystickEvent_SetPosition( TSelf(wxJoystickEvent) _obj, TPoin=
t(x,y) );=0D
void wxJoystickEvent_SetZPosition( TSelf(wxJoystickEvent) _obj, int =
zPos );=0D
=0D
/* wxKeyEvent */=0D
hunk ./wxc/include/wxc_glue.h 2877
TBool wxKeyEvent_ControlDown( TSelf(wxKeyEvent) _obj );=0D
void wxKeyEvent_CopyObject( TSelf(wxKeyEvent) _obj, void* obj );=0D
int wxKeyEvent_GetKeyCode( TSelf(wxKeyEvent) _obj );=0D
-void wxKeyEvent_GetPosition( TSelf(wxKeyEvent) _obj, TPointOut(_x,_y=
) );=0D
+TClass(wxPoint) wxKeyEvent_GetPosition( TSelf(wxKeyEvent) _obj );=0D
int wxKeyEvent_GetX( TSelf(wxKeyEvent) _obj );=0D
int wxKeyEvent_GetY( TSelf(wxKeyEvent) _obj );=0D
int wxKeyEvent_GetModifiers( TSelf(wxKeyEvent) _obj );=0D
hunk ./wxc/include/wxc_glue.h 2964
TBool wxListCtrl_GetItem( TSelf(wxListCtrl) _obj, TClass(wxListItem) =
info );=0D
int wxListCtrl_GetItemCount( TSelf(wxListCtrl) _obj );=0D
int wxListCtrl_GetItemData( TSelf(wxListCtrl) _obj, int item );=0D
-TBool wxListCtrl_GetItemPosition( TSelf(wxListCtrl) _obj, int item, i=
nt*x, int* y );=0D
-int wxListCtrl_GetItemRect( TSelf(wxListCtrl) _obj, int item, int c=
ode, TRectOutVoid(x,y,w,h) );=0D
-void wxListCtrl_GetItemSpacing( TSelf(wxListCtrl) _obj, TBool isSmal=
l, TSizeOutVoid(w,h) );=0D
+TClass(wxPoint) wxListCtrl_GetItemPosition( TSelf(wxListCtrl) _obj, int it=
em );=0D
+TClass(wxRect) wxListCtrl_GetItemRect( TSelf(wxListCtrl) _obj, int item, i=
nt code );=0D
+TClass(wxSize) wxListCtrl_GetItemSpacing( TSelf(wxListCtrl) _obj, TBool is=
Small );=0D
int wxListCtrl_GetItemState( TSelf(wxListCtrl) _obj, int item, int =
stateMask );=0D
TClass(wxString) wxListCtrl_GetItemText( TSelf(wxListCtrl) _obj, int item =
);=0D
int wxListCtrl_GetNextItem( TSelf(wxListCtrl) _obj, int item, int g=
eometry, int state );=0D
hunk ./wxc/include/wxc_glue.h 3014
int wxListEvent_GetOldIndex( TSelf(wxListEvent) _obj );=0D
int wxListEvent_GetOldItem( TSelf(wxListEvent) _obj );=0D
*/=0D
-void wxListEvent_GetPoint( TSelf(wxListEvent) _obj, TPointOutVoid(_x=
,_y) );=0D
+TClass(wxPoint) wxListEvent_GetPoint( TSelf(wxListEvent) _obj );=0D
TClass(wxString) wxListEvent_GetText( TSelf(wxListEvent) _obj );=0D
=0D
/* wxListItem */=0D
hunk ./wxc/include/wxc_glue.h 3319
void wxMouseEvent_CopyObject( TSelf(wxMouseEvent) _obj, void* object=
_dest );=0D
TBool wxMouseEvent_Dragging( TSelf(wxMouseEvent) _obj );=0D
TBool wxMouseEvent_Entering( TSelf(wxMouseEvent) _obj );=0D
-void wxMouseEvent_GetLogicalPosition( TSelf(wxMouseEvent) _obj, TCla=
ss(wxDC) dc, TPointOut(_x,_y) );=0D
-void wxMouseEvent_GetPosition( TSelf(wxMouseEvent) _obj, TPointOut(_=
x,_y) );=0D
+TClass(wxPoint) wxMouseEvent_GetLogicalPosition( TSelf(wxMouseEvent) _obj,=
TClass(wxDC) dc );=0D
+TClass(wxPoint) wxMouseEvent_GetPosition( TSelf(wxMouseEvent) _obj );=0D
int wxMouseEvent_GetX( TSelf(wxMouseEvent) _obj );=0D
int wxMouseEvent_GetY( TSelf(wxMouseEvent) _obj );=0D
TBool wxMouseEvent_IsButton( TSelf(wxMouseEvent) _obj );=0D
hunk ./wxc/include/wxc_glue.h 3344
/* wxMoveEvent */=0D
TClassDefExtend(wxMoveEvent,wxEvent)=0D
void wxMoveEvent_CopyObject( TSelf(wxMoveEvent) _obj, void* obj );=
=0D
-void wxMoveEvent_GetPosition( TSelf(wxMoveEvent) _obj, TPointOut(_x,=
_y) );=0D
+TClass(wxPoint) wxMoveEvent_GetPosition( TSelf(wxMoveEvent) _obj );=0D
=0D
/* wxMultiCellCanvas */=0D
TClassDefExtend(wxMultiCellCanvas,wxFlexGridSizer)=0D
hunk ./wxc/include/wxc_glue.h 3513
TBool wxPageSetupDialogData_GetEnableOrientation( TSelf(wxPageSetupDi=
alogData) _obj );=0D
TBool wxPageSetupDialogData_GetEnablePaper( TSelf(wxPageSetupDialogDa=
ta) _obj );=0D
TBool wxPageSetupDialogData_GetEnablePrinter( TSelf(wxPageSetupDialog=
Data) _obj );=0D
-void wxPageSetupDialogData_GetMarginBottomRight( TSelf(wxPageSetupDi=
alogData) _obj, TPointOutVoid(_x,_y) );=0D
-void wxPageSetupDialogData_GetMarginTopLeft( TSelf(wxPageSetupDialog=
Data) _obj, TPointOutVoid(_x,_y) );=0D
-void wxPageSetupDialogData_GetMinMarginBottomRight( TSelf(wxPageSetu=
pDialogData) _obj, TPointOutVoid(_x,_y) );=0D
-void wxPageSetupDialogData_GetMinMarginTopLeft( TSelf(wxPageSetupDia=
logData) _obj, TPointOutVoid(_x,_y) );=0D
+TClass(wxPoint) wxPageSetupDialogData_GetMarginBottomRight( TSelf(wxPageSe=
tupDialogData) _obj );=0D
+TClass(wxPoint) wxPageSetupDialogData_GetMarginTopLeft( TSelf(wxPageSetupD=
ialogData) _obj );=0D
+TClass(wxPoint) wxPageSetupDialogData_GetMinMarginBottomRight( TSelf(wxPag=
eSetupDialogData) _obj );=0D
+TClass(wxPoint) wxPageSetupDialogData_GetMinMarginTopLeft( TSelf(wxPageSet=
upDialogData) _obj );=0D
int wxPageSetupDialogData_GetPaperId( TSelf(wxPageSetupDialogData) =
_obj );=0D
hunk ./wxc/include/wxc_glue.h 3518
-void wxPageSetupDialogData_GetPaperSize( TSelf(wxPageSetupDialogData=
) _obj, TSizeOutVoid(_w,_h) );=0D
+TClass(wxSize) wxPageSetupDialogData_GetPaperSize( TSelf(wxPageSetupDialog=
Data) _obj );=0D
void wxPageSetupDialogData_GetPrintData( TSelf(wxPageSetupDialogData=
) _obj, TClassRef(wxPrintData) _ref );=0D
void wxPageSetupDialogData_SetDefaultInfo( TSelf(wxPageSetupDialogDa=
ta) _obj, TBool flag );=0D
void wxPageSetupDialogData_SetDefaultMinMargins( TSelf(wxPageSetupDi=
alogData) _obj, int flag );=0D
hunk ./wxc/include/wxc_glue.h 3695
int wxPrintData_GetNoCopies( TSelf(wxPrintData) _obj );=0D
int wxPrintData_GetOrientation( TSelf(wxPrintData) _obj );=0D
int wxPrintData_GetPaperId( TSelf(wxPrintData) _obj );=0D
-void wxPrintData_GetPaperSize( TSelf(wxPrintData) _obj, TSizeOutVoid=
(_w,_h) );=0D
+TClass(wxSize) wxPrintData_GetPaperSize( TSelf(wxPrintData) _obj );=0D
TClass(wxString) wxPrintData_GetPreviewCommand( TSelf(wxPrintData) _obj );=
=0D
int wxPrintData_GetPrintMode( TSelf(wxPrintData) _obj );=0D
TClass(wxString) wxPrintData_GetPrinterCommand( TSelf(wxPrintData) _obj );=
=0D
hunk ./wxc/include/wxc_glue.h 3820
TClassDefExtend(wxPrinterDC,wxDC)=0D
TClass(wxPrinterDC) wxPrinterDC_Create( TClass(wxPrintData) data );=0D
void wxPrinterDC_Delete( TSelf(wxPrinterDC) self );=0D
-void wxPrinterDC_GetPaperRect( TSelf(wxPrinterDC) self, TRectOut(_x,=
_y,_w,_h) );=0D
+TClass(wxRect) wxPrinterDC_GetPaperRect( TSelf(wxPrinterDC) self );=0D
=0D
/* wxPrintout */=0D
TClassDefExtend(wxPrintout,wxObject)=0D
hunk ./wxc/include/wxc_glue.h 3868
int wxQueryLayoutInfoEvent_GetFlags( TSelf(wxQueryLayoutInfoEvent) =
_obj );=0D
int wxQueryLayoutInfoEvent_GetOrientation( TSelf(wxQueryLayoutInfoE=
vent) _obj );=0D
int wxQueryLayoutInfoEvent_GetRequestedLength( TSelf(wxQueryLayoutI=
nfoEvent) _obj );=0D
-void wxQueryLayoutInfoEvent_GetSize( TSelf(wxQueryLayoutInfoEvent) _=
obj, TSizeOutVoid(_w,_h) );=0D
+TClass(wxSize) wxQueryLayoutInfoEvent_GetSize( TSelf(wxQueryLayoutInfoEven=
t) _obj );=0D
void wxQueryLayoutInfoEvent_SetAlignment( TSelf(wxQueryLayoutInfoEve=
nt) _obj, int align );=0D
void wxQueryLayoutInfoEvent_SetFlags( TSelf(wxQueryLayoutInfoEvent) =
_obj, int flags );=0D
void wxQueryLayoutInfoEvent_SetOrientation( TSelf(wxQueryLayoutInfoE=
vent) _obj, int orient );=0D
hunk ./wxc/include/wxc_glue.h 3977
/* wxSashEvent */=0D
TClassDefExtend(wxSashEvent,wxEvent)=0D
TClass(wxSashEvent) wxSashEvent_Create( int id, int edge );=0D
-void wxSashEvent_GetDragRect( TSelf(wxSashEvent) _obj, TRectOutVoid(=
_x,_y,_w,_h) );=0D
+TClass(wxRect) wxSashEvent_GetDragRect( TSelf(wxSashEvent) _obj );=0D
int wxSashEvent_GetDragStatus( TSelf(wxSashEvent) _obj );=0D
int wxSashEvent_GetEdge( TSelf(wxSashEvent) _obj );=0D
void wxSashEvent_SetDragRect( TSelf(wxSashEvent) _obj, TRect(x,y,w,h=
) );=0D
hunk ./wxc/include/wxc_glue.h 4122
/* wxSizeEvent */=0D
TClassDefExtend(wxSizeEvent,wxEvent)=0D
void wxSizeEvent_CopyObject( TSelf(wxSizeEvent) _obj, void* obj );=
=0D
-void wxSizeEvent_GetSize( TSelf(wxSizeEvent) _obj, TSizeOut(_w,_h) )=
;=0D
+TClass(wxSize) wxSizeEvent_GetSize( TSelf(wxSizeEvent) _obj );=0D
=0D
/* wxSizer */=0D
TClassDefExtend(wxSizer,wxObject)=0D
hunk ./wxc/include/wxc_glue.h 4129
void wxSizer_Add( TSelf(wxSizer) _obj, TSize(width,height), int opti=
on, int flag, int border, void* userData );=0D
void wxSizer_AddSizer( TSelf(wxSizer) _obj, TClass(wxSizer) sizer, i=
nt option, int flag, int border, void* userData );=0D
void wxSizer_AddWindow( TSelf(wxSizer) _obj, TClass(wxWindow) window=
, int option, int flag, int border, void* userData );=0D
-void wxSizer_CalcMin( TSelf(wxSizer) _obj, TSizeOutVoid(_w,_h) );=0D
+TClass(wxSize) wxSizer_CalcMin( TSelf(wxSizer) _obj );=0D
void wxSizer_Fit( TSelf(wxSizer) _obj, TClass(wxWindow) window );=0D
int wxSizer_GetChildren( TSelf(wxSizer) _obj, void* _res, int _cnt =
);=0D
hunk ./wxc/include/wxc_glue.h 4132
-void wxSizer_GetMinSize( TSelf(wxSizer) _obj, TSizeOutVoid(_w,_h) );=
=0D
-void wxSizer_GetPosition( TSelf(wxSizer) _obj, TPointOutVoid(_x,_y) =
);=0D
-void wxSizer_GetSize( TSelf(wxSizer) _obj, TSizeOutVoid(_w,_h) );=0D
+TClass(wxSize) wxSizer_GetMinSize( TSelf(wxSizer) _obj );=0D=0D
+TClass(wxPoint) wxSizer_GetPosition( TSelf(wxSizer) _obj );=0D=0D
+TClass(wxSize) wxSizer_GetSize( TSelf(wxSizer) _obj );=0D
void wxSizer_Insert( TSelf(wxSizer) _obj, int before, TSize(width,he=
ight), int option, int flag, int border, void* userData );=0D
void wxSizer_InsertSizer( TSelf(wxSizer) _obj, int before, TClass(wx=
Sizer) sizer, int option, int flag, int border, void* userData );=0D
void wxSizer_InsertWindow( TSelf(wxSizer) _obj, int before, TClass(w=
xWindow) window, int option, int flag, int border, void* userData );=0D
hunk ./wxc/include/wxc_glue.h 4179
TBool wxSizer_Show( TSelf(wxSizer) _obj, TClass(wxSizer) sizer, int i=
ndex, TBool show );=0D
/* wxSizerItem */=0D
TClassDefExtend(wxSizerItem,wxObject)=0D
-void wxSizerItem_CalcMin( TSelf(wxSizerItem) _obj, TSizeOutVoid(_w,_=
h) );=0D
+TClass(wxSize) wxSizerItem_CalcMin( TSelf(wxSizerItem) _obj );=0D
TClass(wxSizerItem) wxSizerItem_Create( TSize(width,height), int option, i=
nt flag, int border, void* userData );=0D
void* wxSizerItem_CreateInSizer( TClass(wxSizer) sizer, int option, i=
nt flag, int border, void* userData );=0D
void* wxSizerItem_CreateInWindow( TClass(wxWindow) window, int option=
, int flag, int border, void* userData );=0D
hunk ./wxc/include/wxc_glue.h 4185
int wxSizerItem_GetBorder( TSelf(wxSizerItem) _obj );=0D
int wxSizerItem_GetFlag( TSelf(wxSizerItem) _obj );=0D
-void wxSizerItem_GetMinSize( TSelf(wxSizerItem) _obj, TSizeOutVoid(_=
w,_h) );=0D
-void wxSizerItem_GetPosition( TSelf(wxSizerItem) _obj, TPointOutVoid=
(_x,_y) );=0D
+TClass(wxSize) wxSizerItem_GetMinSize( TSelf(wxSizerItem) _obj );=0D
+TClass(wxPoint) wxSizerItem_GetPosition( TSelf(wxSizerItem) _obj );=0D
float wxSizerItem_GetRatio( TSelf(wxSizerItem) _obj );=0D
hunk ./wxc/include/wxc_glue.h 4188
-void wxSizerItem_GetSize( TSelf(wxSizerItem) _obj, TSizeOutVoid(_w,_=
h) );=0D
+TClass(wxSize) wxSizerItem_GetSize( TSelf(wxSizerItem) _obj );=0D
TClass(wxSizer) wxSizerItem_GetSizer( TSelf(wxSizerItem) _obj );=0D
void* wxSizerItem_GetUserData( TSelf(wxSizerItem) _obj );=0D
TClass(wxWindow) wxSizerItem_GetWindow( TSelf(wxSizerItem) _obj );=0D
hunk ./wxc/include/wxc_glue.h 4207
void wxSizerItem_DeleteWindows( TSelf(wxSizerItem) _obj );=0D
void wxSizerItem_DetachSizer( TSelf(wxSizerItem) _obj );=0D
int wxSizerItem_GetProportion( TSelf(wxSizerItem) _obj );=0D
-void wxSizerItem_GetRect( TSelf(wxSizerItem) _obj, TRectOutVoid(_x,_=
y,_w,_h) );=0D
-void wxSizerItem_GetSpacer( TSelf(wxSizerItem) _obj, TSizeOutVoid(_w=
,_h) );=0D
+TClass(wxRect) wxSizerItem_GetRect( TSelf(wxSizerItem) _obj );=0D
+TClass(wxSize) wxSizerItem_GetSpacer( TSelf(wxSizerItem) _obj );=0D
int wxSizerItem_IsShown( TSelf(wxSizerItem) _obj );=0D
void wxSizerItem_SetProportion( TSelf(wxSizerItem) _obj, int proport=
ion );=0D
void wxSizerItem_SetSpacer( TSelf(wxSizerItem) _obj, TSize(width,hei=
ght) );=0D
hunk ./wxc/include/wxc_glue.h 4329
=0D
/* wxStaticBoxSizer */=0D
TClassDefExtend(wxStaticBoxSizer,wxBoxSizer)=0D
-void wxStaticBoxSizer_CalcMin( TSelf(wxStaticBoxSizer) _obj, TSizeOu=
tVoid(_w,_h) );=0D
+TClass(wxSize) wxStaticBoxSizer_CalcMin( TSelf(wxStaticBoxSizer) _obj );=
=0D
TClass(wxStaticBoxSizer) wxStaticBoxSizer_Create( TClass(wxStaticBox) box,=
int orient );=0D
TClass(wxStaticBox) wxStaticBoxSizer_GetStaticBox( TSelf(wxStaticBoxSizer)=
_obj );=0D
void wxStaticBoxSizer_RecalcSizes( TSelf(wxStaticBoxSizer) _obj );=
=0D
hunk ./wxc/include/wxc_glue.h 4576
TBool wxToolBar_DeleteTool( TSelf(wxToolBar) _obj, int id );=0D
TBool wxToolBar_DeleteToolByPos( TSelf(wxToolBar) _obj, int pos );=0D
void wxToolBar_EnableTool( TSelf(wxToolBar) _obj, int id, TBool enab=
le );=0D
-void wxToolBar_GetMargins( TSelf(wxToolBar) _obj, TPointOutVoid(x,y)=
);=0D
-void wxToolBar_GetToolBitmapSize( TSelf(wxToolBar) _obj, TSizeOutVoi=
d(_x,_y) );=0D
+TClass(wxPoint) wxToolBar_GetMargins( TSelf(wxToolBar) _obj );=0D
+TClass(wxSize) wxToolBar_GetToolBitmapSize( TSelf(wxToolBar) _obj );=0D
TClass(wxObject) wxToolBar_GetToolClientData( TSelf(wxToolBar) _obj, int i=
d );=0D
TBool wxToolBar_GetToolEnabled( TSelf(wxToolBar) _obj, int id );=0D
TClass(wxString) wxToolBar_GetToolLongHelp( TSelf(wxToolBar) _obj, int id =
);=0D
hunk ./wxc/include/wxc_glue.h 4583
int wxToolBar_GetToolPacking( TSelf(wxToolBar) _obj );=0D
TClass(wxString) wxToolBar_GetToolShortHelp( TSelf(wxToolBar) _obj, int id=
);=0D
-void wxToolBar_GetToolSize( TSelf(wxToolBar) _obj, TPointOutVoid(_x,=
_y) );=0D
+TClass(wxSize) wxToolBar_GetToolSize( TSelf(wxToolBar) _obj );=0D
TBool wxToolBar_GetToolState( TSelf(wxToolBar) _obj, int id );=0D
void wxToolBar_InsertControl( TSelf(wxToolBar) _obj, int pos, TClass=
(wxControl) ctrl );=0D
void wxToolBar_InsertSeparator( TSelf(wxToolBar) _obj, int pos );=0D
hunk ./wxc/include/wxc_glue.h 4660
void wxTreeCtrl_EndEditLabel( TSelf(wxTreeCtrl) _obj, TClass(wxTreeI=
temId) item, TBool discardChanges );=0D
void wxTreeCtrl_EnsureVisible( TSelf(wxTreeCtrl) _obj, TClass(wxTree=
ItemId) item );=0D
void wxTreeCtrl_Expand( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId)=
item );=0D
-int wxTreeCtrl_GetBoundingRect( TSelf(wxTreeCtrl) _obj, TClass(wxTr=
eeItemId) item, TBool textOnly, TRectOutVoid(x,y,w,h) );=0D
+TClass(wxRect) wxTreeCtrl_GetBoundingRect( TSelf(wxTreeCtrl) _obj, TClass(=
wxTreeItemId) item, TBool textOnly );=0D
int wxTreeCtrl_GetChildrenCount( TSelf(wxTreeCtrl) _obj, TClass(wxT=
reeItemId) item, TBool recursively );=0D
int wxTreeCtrl_GetCount( TSelf(wxTreeCtrl) _obj );=0D
TClass(wxTextCtrl) wxTreeCtrl_GetEditControl( TSelf(wxTreeCtrl) _obj );=0D
hunk ./wxc/include/wxc_glue.h 4719
void wxTreeEvent_GetItem( TSelf(wxTreeEvent) _obj, TClassRef(wxTreeI=
temId) _ref );=0D
TClass(wxString) wxTreeEvent_GetLabel( TSelf(wxTreeEvent) _obj );=0D
void wxTreeEvent_GetOldItem( TSelf(wxTreeEvent) _obj, TClassRef(wxTr=
eeItemId) _ref );=0D
-void wxTreeEvent_GetPoint( TSelf(wxTreeEvent) _obj, TPointOutVoid(_x=
,_y) );=0D
+TClass(wxPoint) wxTreeEvent_GetPoint( TSelf(wxTreeEvent) _obj );=0D
=0D
/* wxTreeItemData */=0D
TClassDefExtend(wxTreeItemData,wxClientData)=0D
hunk ./wxc/include/wxc_glue.h 4783
void wxWindow_Center( TSelf(wxWindow) _obj, int direction );=0D
void wxWindow_CenterOnParent( TSelf(wxWindow) _obj, int dir );=0D
void wxWindow_ClearBackground( TSelf(wxWindow) _obj );=0D
-void wxWindow_ClientToScreen( TSelf(wxWindow) _obj, TPoint(x,y), TPo=
intOut(sx,sy) );=0D
+TClass(wxPoint) wxWindow_ClientToScreen( TSelf(wxWindow) _obj, TPoint(x,y)=
);=0D
TBool wxWindow_Close( TSelf(wxWindow) _obj, TBool _force );=0D
hunk ./wxc/include/wxc_glue.h 4785
-void wxWindow_ConvertDialogToPixels( TSelf(wxWindow) _obj, TPointOut=
(_x,_y) );=0D
-void wxWindow_ConvertPixelsToDialog( TSelf(wxWindow) _obj, TPointOut=
(_x,_y) );=0D
+TClass(wxPoint) wxWindow_ConvertDialogToPixels( TSelf(wxWindow) _obj );=0D
+TClass(wxPoint) wxWindow_ConvertPixelsToDialog( TSelf(wxWindow) _obj );=0D
TClass(wxWindow) wxWindow_Create( TClass(wxWindow) _prt, int _id, TRect(_x=
,_y,_w,_h), int _stl );=0D
void wxWindow_DeleteRelatedConstraints( TSelf(wxWindow) _obj );=0D
TBool wxWindow_Destroy( TSelf(wxWindow) _obj );=0D
hunk ./wxc/include/wxc_glue.h 4799
void wxWindow_Fit( TSelf(wxWindow) _obj );=0D
void wxWindow_FitInside( TSelf(wxWindow) _obj );=0D
void wxWindow_Freeze( TSelf(wxWindow) _obj );=0D
-void wxWindow_GetEffectiveMinSize( TSelf(wxWindow) _obj, TSizeOutVoi=
d(_w,_h) );=0D
+TClass(wxSize) wxWindow_GetEffectiveMinSize( TSelf(wxWindow) _obj );=0D
int wxWindow_GetAutoLayout( TSelf(wxWindow) _obj );=0D
void wxWindow_GetBackgroundColour( TSelf(wxWindow) _obj, TClassRef(w=
xColour) _ref );=0D
hunk ./wxc/include/wxc_glue.h 4802
-void wxWindow_GetBestSize( TSelf(wxWindow) _obj, TSizeOutVoid(_w,_h)=
);=0D
+TClass(wxSize) wxWindow_GetBestSize( TSelf(wxWindow) _obj );=0D
TClass(wxCaret) wxWindow_GetCaret( TSelf(wxWindow) _obj );=0D
int wxWindow_GetCharHeight( TSelf(wxWindow) _obj );=0D
int wxWindow_GetCharWidth( TSelf(wxWindow) _obj );=0D
hunk ./wxc/include/wxc_glue.h 4808
int wxWindow_GetChildren( TSelf(wxWindow) _obj, void* _res, int _cn=
t );=0D
TClass(wxClientData) wxWindow_GetClientData( TSelf(wxWindow) _obj );=0D
-void wxWindow_GetClientSize( TSelf(wxWindow) _obj, TSizeOutVoid(_w,_=
h) );=0D
+TClass(wxSize) wxWindow_GetClientSize( TSelf(wxWindow) _obj );=0D
void wxWindow_GetClientSizeConstraint( TSelf(wxWindow) _obj, TSizeOu=
t(_w,_h) );=0D
TClass(wxLayoutConstraints) wxWindow_GetConstraints( TSelf(wxWindow) _obj =
);=0D
void* wxWindow_GetConstraintsInvolvedIn( TSelf(wxWindow) _obj );=0D
hunk ./wxc/include/wxc_glue.h 4827
int wxWindow_GetMinWidth( TSelf(wxWindow) _obj );=0D
TClass(wxString) wxWindow_GetName( TSelf(wxWindow) _obj );=0D
TClass(wxWindow) wxWindow_GetParent( TSelf(wxWindow) _obj );=0D
-void wxWindow_GetPosition( TSelf(wxWindow) _obj, TPointOutVoid(_x,_y=
) );=0D
+TClass(wxPoint) wxWindow_GetPosition( TSelf(wxWindow) _obj );=0D
void wxWindow_GetPositionConstraint( TSelf(wxWindow) _obj, TPointOut=
(_x,_y) );=0D
hunk ./wxc/include/wxc_glue.h 4829
-void wxWindow_GetRect( TSelf(wxWindow) _obj, TRectOutVoid(_x,_y,_w,_=
h) );=0D
+TClass(wxRect) wxWindow_GetRect( TSelf(wxWindow) _obj );=0D
int wxWindow_GetScrollPos( TSelf(wxWindow) _obj, int orient );=0D
int wxWindow_GetScrollRange( TSelf(wxWindow) _obj, int orient );=0D
int wxWindow_GetScrollThumb( TSelf(wxWindow) _obj, int orient );=0D
hunk ./wxc/include/wxc_glue.h 4833
-void wxWindow_GetSize( TSelf(wxWindow) _obj, TSizeOutVoid(_w,_h) );=
=0D
+TClass(wxSize) wxWindow_GetSize( TSelf(wxWindow) _obj );=0D
void wxWindow_GetSizeConstraint( TSelf(wxWindow) _obj, TSizeOut(_w,_=
h) );=0D
TClass(wxSizer) wxWindow_GetSizer( TSelf(wxWindow) _obj );=0D
void wxWindow_GetTextExtent( TSelf(wxWindow) _obj, TClass(wxString) =
string, int* x, int* y, int* descent, int* externalLeading, TClass(wxFont) =
theFont );=0D
hunk ./wxc/include/wxc_glue.h 4840
TClass(wxString) wxWindow_GetToolTip( TSelf(wxWindow) _obj );=0D
TClass(wxRegion) wxWindow_GetUpdateRegion( TSelf(wxWindow) _obj );=0D
TClass(wxValidator) wxWindow_GetValidator( TSelf(wxWindow) _obj );=0D
-void wxWindow_GetVirtualSize( TSelf(wxWindow) _obj, TSizeOut(w,h) );=
=0D
+TClass(wxSize) wxWindow_GetVirtualSize( TSelf(wxWindow) _obj );=0D
int wxWindow_GetWindowStyleFlag( TSelf(wxWindow) _obj );=0D
TBool wxWindow_HasFlag( TSelf(wxWindow) _obj, int flag );=0D
TBool wxWindow_Hide( TSelf(wxWindow) _obj );=0D
hunk ./wxc/include/wxc_glue.h 4869
void wxWindow_RemoveConstraintReference( TSelf(wxWindow) _obj, TClas=
s(wxWindow) otherWin );=0D
int wxWindow_Reparent( TSelf(wxWindow) _obj, TClass(wxWindow) _par =
);=0D
void wxWindow_ResetConstraints( TSelf(wxWindow) _obj );=0D
-void wxWindow_ScreenToClient( TSelf(wxWindow) _obj, int* x, int* y )=
;=0D
+TClass(wxPoint) wxWindow_ScreenToClient( TSelf(wxWindow) _obj, TPoint(x,y)=
);=0D
void wxWindow_ScrollWindow( TSelf(wxWindow) _obj, TVector(dx,dy) );=
=0D
void wxWindow_ScrollWindowRect( TSelf(wxWindow) _obj, TVector(dx,dy)=
, TRect(x,y,w,h) );=0D
void wxWindow_SetAcceleratorTable( TSelf(wxWindow) _obj, TClass(wxAc=
celeratorTable) accel );=0D
hunk ./wxc/include/wxc_glue.h 4932
TClass(wxWizardPage) wxWizard_GetCurrentPage( TSelf(wxWizard) _obj );=0D
void wxWizard_GetPageSize( TSelf(wxWizard) _obj, TSizeOutVoid(_w,_h)=
);=0D
int wxWizard_RunWizard( TSelf(wxWizard) _obj, TClass(wxWizardPage) =
firstPage );=0D
-void wxWizard_SetPageSize( TSelf(wxWizard) _obj, TSize(w,h) );=0D
+TClass(wxSize) wxWizard_GetPageSize( TSelf(wxWizard) _obj );=0D
=0D
/* wxWizardEvent */=0D
TClassDefExtend(wxWizardEvent,wxNotifyEvent)=0D
hunk ./wxc/src/dragimage.cpp 9
/*------------------------------------------------------------------------=
-----
DragImage
--------------------------------------------------------------------------=
---*/
-EWXWEXPORT(wxDragImage*,wxDragImage_Create)( const wxBitmap* image, int x,=
int y )
+EWXWEXPORT(wxDragImage*,wxDragImage_Create)(wxBitmap* image,int x,int y)
{
return new wxDragImage(*image, wxNullCursor, wxPoint(x, y));
}
hunk ./wxc/src/dragimage.cpp 14
=
-EWXWEXPORT(wxDragImage*,wxDragIcon)( const wxIcon* icon, int x, int y )
+EWXWEXPORT(wxDragImage*,wxDragIcon)(wxIcon* icon,int x,int y)
{
return new wxDragImage(*icon, wxNullCursor, wxPoint(x, y));
}
hunk ./wxc/src/dragimage.cpp 19
=
-EWXWEXPORT(wxDragImage*,wxDragString)( const wxString* text, int x, int y =
)
+EWXWEXPORT(wxDragImage*,wxDragString)(wxString* text,int x,int y)
{
return new wxDragImage(*text, wxNullCursor, wxPoint(x, y));
}
hunk ./wxc/src/dragimage.cpp 24
=
-EWXWEXPORT(wxDragImage*,wxDragTreeItem)( const wxTreeCtrl* treeCtrl, wxTre=
eItemId* id )
+EWXWEXPORT(wxDragImage*,wxDragTreeItem)(wxTreeCtrl* treeCtrl,wxTreeItemId*=
id)
{
hunk ./wxc/src/dragimage.cpp 26
- return new wxDragImage(*treeCtrl, *id);
+ return new wxDragImage(*treeCtrl,*id);
}
=
hunk ./wxc/src/dragimage.cpp 29
-EWXWEXPORT(wxDragImage*,wxDragListItem)( const wxListCtrl* listCtrl, long =
id )
+EWXWEXPORT(wxDragImage*,wxDragListItem)(wxListCtrl* listCtrl,long id)
{
return new wxDragImage(*listCtrl, id);
}
hunk ./wxc/src/dragimage.cpp 34
=
-EWXWEXPORT(wxGenericDragImage*,wxGenericDragImage_Create)( const wxCursor*=
cursor )
+EWXWEXPORT(wxGenericDragImage*,wxGenericDragImage_Create)(wxCursor* cursor=
)
{
return new wxGenericDragImage(*cursor);
}
hunk ./wxc/src/dragimage.cpp 39
=
-EWXWEXPORT(wxGenericDragImage*,wxGenericDragIcon)( const wxIcon* icon )
+EWXWEXPORT(wxGenericDragImage*,wxGenericDragIcon)(wxIcon* icon)
{
return new wxGenericDragImage(*icon, wxNullCursor);
}
hunk ./wxc/src/dragimage.cpp 44
=
-EWXWEXPORT(wxGenericDragImage*,wxGenericDragString)( const wxString* text =
)
+EWXWEXPORT(wxGenericDragImage*,wxGenericDragString)(wxString* text)
{
return new wxGenericDragImage(*text, wxNullCursor);
}
hunk ./wxc/src/dragimage.cpp 49
=
-EWXWEXPORT(wxGenericDragImage*,wxGenericDragTreeItem)( const wxTreeCtrl* t=
reeCtrl, wxTreeItemId* id )
+EWXWEXPORT(wxGenericDragImage*,wxGenericDragTreeItem)(wxTreeCtrl* treeCtrl=
,wxTreeItemId* id)
{
hunk ./wxc/src/dragimage.cpp 51
- return new wxGenericDragImage(*treeCtrl, *id);
+ return new wxGenericDragImage(*treeCtrl,*id);
}
=
hunk ./wxc/src/dragimage.cpp 54
-EWXWEXPORT(wxGenericDragImage*,wxGenericDragListItem)( const wxListCtrl* l=
istCtrl, long id )
+EWXWEXPORT(wxGenericDragImage*,wxGenericDragListItem)(wxListCtrl* listCtrl=
,long id)
{
return new wxGenericDragImage(*listCtrl, id);
}
hunk ./wxc/src/dragimage.cpp 59
=
-EWXWEXPORT(void,wxDragImage_Delete)(wxDragImage* self) =
+EWXWEXPORT(void,wxDragImage_Delete)(wxDragImage* self)
{
if (self) delete self;
}
hunk ./wxc/src/dragimage.cpp 64
=
-EWXWEXPORT(bool,wxDragImage_BeginDragFullScreen)( wxDragImage* self, int x=
_pos, int y_pos,
- wxWindow* window, bool f=
ullScreen,
- wxRect* rect)
+EWXWEXPORT(bool,wxDragImage_BeginDragFullScreen)(wxDragImage* self,int x_p=
os,int y_pos,wxWindow* window,bool fullScreen,wxRect* rect)
{
return self->BeginDrag(wxPoint(x_pos, y_pos), window, fullScreen, rect);
}
hunk ./wxc/src/dragimage.cpp 69
=
-EWXWEXPORT(bool,wxDragImage_BeginDrag)( wxDragImage* self, int x, int y,
- wxWindow* window, wxWindow* boundi=
ngWindow)
+EWXWEXPORT(bool,wxDragImage_BeginDrag)(wxDragImage* self,int x,int y,wxWin=
dow* window,wxWindow* boundingWindow)
{
return self->BeginDrag(wxPoint(x, y), window, boundingWindow);
}
hunk ./wxc/src/dragimage.cpp 74
=
-EWXWEXPORT(bool,wxGenericDragImage_DoDrawImage)( wxGenericDragImage* self,=
wxDC* dc, int x, int y)
+EWXWEXPORT(bool,wxGenericDragImage_DoDrawImage)(wxGenericDragImage* self,w=
xDC* dc,int x,int y)
{
return self->DoDrawImage(*dc, wxPoint(x, y));
}
hunk ./wxc/src/dragimage.cpp 79
=
-EWXWEXPORT(bool,wxDragImage_EndDrag)( wxDragImage* self)
+EWXWEXPORT(bool,wxDragImage_EndDrag)(wxDragImage* self)
{
return self->EndDrag();
}
hunk ./wxc/src/dragimage.cpp 84
=
-EWXWEXPORT(void,wxGenericDragImage_GetImageRect)( wxGenericDragImage* self=
, int x_pos, int y_pos,
- int* x, int* y, int* w, =
int* h)
+EWXWEXPORT(wxRect*,wxGenericDragImage_GetImageRect)(wxGenericDragImage* se=
lf,int x_pos,int y_pos)
{
hunk ./wxc/src/dragimage.cpp 86
- wxRect rc =3D self->GetImageRect(wxPoint(x_pos, y_pos));
- *x =3D rc.x;
- *y =3D rc.y;
- *w =3D rc.width;
- *h =3D rc.height;
+ wxRect* r =3D new wxRect();
+ *r =3D self->GetImageRect(wxPoint(x_pos, y_pos));
+ return r;
}
=
hunk ./wxc/src/dragimage.cpp 91
-EWXWEXPORT(bool,wxDragImage_Hide)( wxDragImage* self)
+EWXWEXPORT(bool,wxDragImage_Hide)(wxDragImage* self)
{
return self->Hide();
}
hunk ./wxc/src/dragimage.cpp 96
=
-EWXWEXPORT(bool,wxDragImage_Move)( wxDragImage* self, int x, int y)
+EWXWEXPORT(bool,wxDragImage_Move)(wxDragImage* self,int x,int y)
{
return self->Move(wxPoint(x, y));
}
hunk ./wxc/src/dragimage.cpp 101
=
-EWXWEXPORT(bool,wxDragImage_Show)( wxDragImage* self)
+EWXWEXPORT(bool,wxDragImage_Show)(wxDragImage* self)
{
return self->Show();
}
hunk ./wxc/src/dragimage.cpp 106
=
-EWXWEXPORT(bool,wxGenericDragImage_UpdateBackingFromWindow)( wxGenericDrag=
Image* self, wxDC* windowDC, wxMemoryDC* destDC,
- int x, int y,=
int w, int h,
- int xdest, in=
t ydest, int width, int height)
+EWXWEXPORT(bool,wxGenericDragImage_UpdateBackingFromWindow)(wxGenericDragI=
mage* self,wxDC* windowDC,wxMemoryDC* destDC,int x,int y,int w,int h,int xd=
est,int ydest,int width,int height)
{
hunk ./wxc/src/dragimage.cpp 108
- return self->UpdateBackingFromWindow(*windowDC, *destDC,
+ return self->UpdateBackingFromWindow(*windowDC,*destDC,
wxRect(x, y, w, h),
wxRect(xdest, ydest, width, height)=
);
}
hunk ./wxc/src/eljcaret.cpp 22
return self->IsVisible();=0D
}=0D
=0D
-EWXWEXPORT(void,wxCaret_GetPosition)(void* _obj, void* x, void* y)=0D
+EWXWEXPORT(wxPoint*,wxCaret_GetPosition)(wxCaret* self)=0D
{=0D
hunk ./wxc/src/eljcaret.cpp 24
- ((wxCaret*)_obj)->GetPosition((int*)x, (int*)y);=0D
+ wxPoint* p =3D new wxPoint();=0D
+ *p =3D self->GetPosition();=0D
+ return p;=0D
}=0D
=0D
hunk ./wxc/src/eljcaret.cpp 29
-EWXWEXPORT(void,wxCaret_GetSize)(void* _obj, void* width, void* height)=0D
+EWXWEXPORT(wxSize*,wxCaret_GetSize)(wxCaret* self)=0D
{=0D
hunk ./wxc/src/eljcaret.cpp 31
- ((wxCaret*)_obj)->GetSize((int*)width, (int*)height);=0D
+ wxSize* s =3D new wxSize();=0D
+ *s =3D self->GetSize();=0D
+ return s;=0D
}=0D
=0D
EWXWEXPORT(wxWindow*,wxCaret_GetWindow)(wxCaret* self)=0D
hunk ./wxc/src/eljdc.cpp 239
self->GetMultiLineTextExtent(*string, w, h, heightLine, theFont);=0D
}=0D
=0D
-EWXWEXPORT(void, wxDC_GetSize)(void* _obj, void* width, void* height)=0D
+EWXWEXPORT(wxSize*,wxDC_GetSize)(wxDC* self)=0D
{=0D
hunk ./wxc/src/eljdc.cpp 241
- ((wxDC*)_obj)->GetSize((int*)width, (int*)height);=0D
+ wxSize* s =3D new wxSize();=0D
+ *s =3D self->GetSize();=0D
+ return s;=0D
}=0D
=0D
hunk ./wxc/src/eljdc.cpp 246
-EWXWEXPORT(void, wxDC_GetSizeMM)(void* _obj, void* width, void* height)=0D
+EWXWEXPORT(wxSize*,wxDC_GetSizeMM)(wxDC* self)=0D
{=0D
hunk ./wxc/src/eljdc.cpp 248
- ((wxDC*)_obj)->GetSizeMM((int*)width, (int*)height);=0D
+ wxSize* s =3D new wxSize();=0D
+ *s =3D self->GetSizeMM();=0D
+ return s;=0D
}=0D
=0D
EWXWEXPORT(wxCoord,wxDC_DeviceToLogicalX)(wxDC* self,wxCoord x)=0D
hunk ./wxc/src/eljdc.cpp 308
return self->GetDepth();=0D
}=0D
=0D
-EWXWEXPORT(void, wxDC_GetPPI)(void* _obj, void* width, void* height)=0D
+EWXWEXPORT(wxSize*,wxDC_GetPPI)(wxDC* self)=0D
{=0D
hunk ./wxc/src/eljdc.cpp 310
- wxSize result =3D ((wxDC*)_obj)->GetPPI();=0D
- *((int*)width) =3D result.x;=0D
- *((int*)height) =3D result.y;=0D
+ wxSize* s =3D new wxSize();=0D
+ *s =3D self->GetPPI();=0D
+ return s;=0D
}=0D
=0D
EWXWEXPORT(bool,wxDC_IsOk)(wxDC* self)=0D
hunk ./wxc/src/eljdc.cpp 668
}=0D
=0D
#if wxCHECK_VERSION (2,8,0)=0D
-EWXWEXPORT(void,wxDC_DrawLabel)(void* _obj,wxString* str,int x,int y,int w=
,int h,int align,int indexAccel)=0D
+=0D
+EWXWEXPORT(void,wxDC_DrawLabel)(wxDC* self,wxString* str,int x,int y,int w=
,int h,int align,int indexAccel)=0D
{=0D
wxRect rect(x, y, w, h);=0D
hunk ./wxc/src/eljdc.cpp 672
- ((wxDC*)_obj)->DrawLabel(*str, rect, align, indexAccel);=0D
+ self->DrawLabel(*str, rect, align, indexAccel);=0D
}=0D
=0D
hunk ./wxc/src/eljdc.cpp 675
-EWXWEXPORT(void, wxDC_DrawLabelBitmap)(void* _obj, wxString* str, void *bm=
p, int x, int y, int w, int h, int align, int indexAccel, int *_x, int *_y,=
int *_w, int *_h)=0D
+EWXWEXPORT(wxRect*,wxDC_DrawLabelBitmap)(wxDC* self,wxString* str,wxBitmap=
* bmp,int x,int y,int w,int h,int align,int indexAccel)=0D
{=0D
wxRect rect(x, y, w, h);=0D
hunk ./wxc/src/eljdc.cpp 678
- wxRect bound;=0D
- ((wxDC*)_obj)->DrawLabel(*str, *((wxBitmap *)bmp), rect, align, indexAcc=
el, &bound);=0D
- *_x =3D bound.GetX();=0D
- *_y =3D bound.GetY();=0D
- *_w =3D bound.GetWidth();=0D
- *_h =3D bound.GetHeight();=0D
+ wxRect* r =3D new wxRect();=0D
+ self->DrawLabel(*str,*bmp, rect, align, indexAccel, r);=0D
+ return r;=0D
}=0D
=0D
hunk ./wxc/src/eljdc.cpp 683
-EWXWEXPORT(void, wxDC_DrawPolyPolygon)(void* _obj, int n, void *count, voi=
d* x, void* y, int xoffset, int yoffset, int fillStyle)=0D
+EWXWEXPORT(void,wxDC_DrawPolyPolygon)(wxDC* self,int n,int* count,void* x,=
void* y,int xoffset,int yoffset,int fillStyle)=0D
{=0D
hunk ./wxc/src/eljdc.cpp 685
- int *tmp =3D (int *) count;=0D
+ int *tmp =3D count;=0D
int *cnt =3D new int[n];=0D
int i, j;=0D
int totalItems =3D 0;=0D
hunk ./wxc/src/eljdc.cpp 708
}=0D
}=0D
=0D
- ((wxDC*)_obj)->DrawPolyPolygon(n, cnt, lst, (wxCoord)xoffset, (wxCoord)yo=
ffset, fillStyle);=0D
+ self->DrawPolyPolygon(n, cnt, lst, (wxCoord)xoffset, (wxCoord)yoffset, fi=
llStyle);=0D
=0D
free (lst);=0D
delete cnt;=0D
hunk ./wxc/src/eljevent.cpp 350
return self->Leaving();
}
=
-EWXWEXPORT(void, wxMouseEvent_GetPosition)(void* _obj, int* xpos, int* ypo=
s)
+EWXWEXPORT(wxPoint*,wxMouseEvent_GetPosition)(wxMouseEvent* self)
{
hunk ./wxc/src/eljevent.cpp 352
- ((wxMouseEvent*)_obj)->GetPosition((wxCoord*)xpos, (wxCoord*)ypos)=
;
+ wxPoint* pt =3D new wxPoint();
+ *pt =3D self->GetPosition();
+ return pt;
}
=
hunk ./wxc/src/eljevent.cpp 357
-EWXWEXPORT(void, wxMouseEvent_GetLogicalPosition)(void* _obj, void* dc, in=
t* xpos, int* ypos)
+EWXWEXPORT(wxPoint*,wxMouseEvent_GetLogicalPosition)(wxMouseEvent* self,wx=
DC* dc)
{
hunk ./wxc/src/eljevent.cpp 359
- wxPoint pt =3D ((wxMouseEvent*)_obj)->GetLogicalPosition(*((wxDC*)=
dc));
- *xpos =3D pt.x;
- *ypos =3D pt.y;
+ wxPoint* pt =3D new wxPoint();
+ *pt =3D self->GetLogicalPosition(*dc);
+ return pt;
}
=
EWXWEXPORT(int,wxMouseEvent_GetX)(wxMouseEvent* self)
hunk ./wxc/src/eljevent.cpp 396
self->SetCursor(*cursor);
}
=
-EWXWEXPORT(void*,wxSetCursorEvent_GetCursor)(void* self)
+EWXWEXPORT(wxCursor*,wxSetCursorEvent_GetCursor)(wxSetCursorEvent* self)
{
hunk ./wxc/src/eljevent.cpp 398
- return (void*)(&((wxSetCursorEvent*)self)->GetCursor());
+ wxCursor* cur =3D new wxCursor;
+ *cur =3D self->GetCursor();
+ return cur;
}
=
EWXWEXPORT(bool,wxSetCursorEvent_HasCursor)(wxSetCursorEvent* self)
hunk ./wxc/src/eljevent.cpp 448
self->m_keyCode =3D code;
}
=
-EWXWEXPORT(void, wxKeyEvent_GetPosition)(void* _obj, int* xpos, int* ypos)
+EWXWEXPORT(wxPoint*,wxKeyEvent_GetPosition)(wxKeyEvent* self)
{
hunk ./wxc/src/eljevent.cpp 450
- ((wxKeyEvent*)_obj)->GetPosition((wxCoord*) xpos, (wxCoord*) ypos)=
;
+ wxPoint* pt =3D new wxPoint();
+ *pt =3D self->GetPosition();
+ return pt;
}
=
EWXWEXPORT(wxCoord,wxKeyEvent_GetX)(wxKeyEvent* self)
hunk ./wxc/src/eljevent.cpp 472
#endif
}
=
-EWXWEXPORT(void, wxSizeEvent_GetSize)(void* _obj, int* w, int* h)
+EWXWEXPORT(wxSize*,wxSizeEvent_GetSize)(wxSizeEvent* self)
{
hunk ./wxc/src/eljevent.cpp 474
- wxSize sz =3D ((wxSizeEvent*)_obj)->GetSize();
- *w =3D sz.x;
- *h =3D sz.y;
+ wxSize* s =3D new wxSize();
+ *s =3D self->GetSize();
+ return s;
}
=
EWXWEXPORT(void,wxSizeEvent_CopyObject)(wxSizeEvent* self,wxObject* obj)
hunk ./wxc/src/eljevent.cpp 486
#endif
}
=
-EWXWEXPORT(void, wxMoveEvent_GetPosition)(void* _obj, int* x, int* y)
+EWXWEXPORT(wxPoint*,wxMoveEvent_GetPosition)(wxMoveEvent* self)
{
hunk ./wxc/src/eljevent.cpp 488
- wxPoint pt =3D ((wxMoveEvent*)_obj)->GetPosition();
- *x =3D pt.x;
- *y =3D pt.y;
+ wxPoint* pt =3D new wxPoint();
+ *pt =3D self->GetPosition();
+ return pt;
}
=
EWXWEXPORT(void,wxMoveEvent_CopyObject)(wxMoveEvent* self,wxObject* obj)
hunk ./wxc/src/eljevent.cpp 500
#endif
}
=
-EWXWEXPORT(void*,wxEraseEvent_GetDC)(void* self)
+EWXWEXPORT(wxDC*,wxEraseEvent_GetDC)(wxEraseEvent* self)
{
hunk ./wxc/src/eljevent.cpp 502
- return (void*)((wxEraseEvent*)self)->GetDC();
+ return self->GetDC();
}
=
EWXWEXPORT(void,wxEraseEvent_CopyObject)(wxEraseEvent* self,wxObject* obj)
hunk ./wxc/src/eljevent.cpp 590
#endif
}
=
-EWXWEXPORT(void, wxJoystickEvent_GetPosition)(void* _obj, int* x, int* y)
+EWXWEXPORT(wxPoint*,wxJoystickEvent_GetPosition)(wxJoystickEvent* self)
{
hunk ./wxc/src/eljevent.cpp 592
- wxPoint pt =3D ((wxJoystickEvent*)_obj)->GetPosition();
- *x =3D pt.x;
- *y =3D pt.y;
+ wxPoint* pt =3D new wxPoint();
+ *pt =3D self->GetPosition();
+ return pt;
}
=
EWXWEXPORT(int,wxJoystickEvent_GetZPosition)(wxJoystickEvent* self)
hunk ./wxc/src/eljevent.cpp 632
self->SetButtonChange(change);
}
=
-EWXWEXPORT(void,wxJoystickEvent_SetPosition)(wxJoystickEvent* self,void* p=
os)
+EWXWEXPORT(void,wxJoystickEvent_SetPosition)(wxJoystickEvent* self,int x,i=
nt y)
{
hunk ./wxc/src/eljevent.cpp 634
- self->SetPosition(*((wxPoint*)pos));
+ wxPoint pos(x,y);
+ self->SetPosition(pos);
}
=
EWXWEXPORT(void,wxJoystickEvent_SetZPosition)(wxJoystickEvent* self,int zP=
os)
hunk ./wxc/src/eljevent.cpp 857
#endif
}
=
-EWXWEXPORT(void, wxListEvent_GetPoint)(void* _obj, void* x, void* y)
+EWXWEXPORT(wxPoint*,wxListEvent_GetPoint)(wxListEvent* self)
{
hunk ./wxc/src/eljevent.cpp 859
- wxPoint pos =3D ((wxListEvent*)_obj)->GetPoint();
- *((int*)x) =3D pos.x;
- *((int*)y) =3D pos.y;
+ wxPoint* pt =3D new wxPoint();
+ *pt =3D self->GetPoint();
+ return pt;
}
=
EWXWEXPORT(wxString*,wxListEvent_GetLabel)(wxListEvent* self)
hunk ./wxc/src/eljevent.cpp 913
*_ref =3D self->GetOldItem();
}
=
-EWXWEXPORT(void, wxTreeEvent_GetPoint)(void* _obj, void* x, void* y)
+EWXWEXPORT(wxPoint*,wxTreeEvent_GetPoint)(wxTreeEvent* self)
{
hunk ./wxc/src/eljevent.cpp 915
- wxPoint pos =3D ((wxTreeEvent*)_obj)->GetPoint();
- *((int*)x) =3D pos.x;
- *((int*)y) =3D pos.y;
+ wxPoint* pt =3D new wxPoint();
+ *pt =3D self->GetPoint();
+ return pt;
}
=
EWXWEXPORT(int,wxTreeEvent_GetCode)(wxTreeEvent* self)
hunk ./wxc/src/eljevent.cpp 968
return self->GetPosition();
}
=
-EWXWEXPORT(void,wxHelpEvent_GetPosition)(void* _obj, void* x, void* y)
+EWXWEXPORT(wxPoint*,wxHelpEvent_GetPosition)(wxHelpEvent* self)
{
hunk ./wxc/src/eljevent.cpp 970
- wxPoint pos =3D ((wxHelpEvent*)_obj)->GetPosition();
- *((int*)x) =3D pos.x;
- *((int*)y) =3D pos.y;
+ wxPoint* pt =3D new wxPoint();
+ *pt =3D self->GetPosition();
+ return pt;
}
=
EWXWEXPORT(void,wxHelpEvent_SetPosition)(wxHelpEvent* self,int x,int y)
hunk ./wxc/src/eljgrid.cpp 22
return self->GetCount();=0D
}=0D
=0D
-EWXWEXPORT(void,wxGridCellCoordsArray_Item)(void* _obj,int _idx,int* _c,in=
t* _r)=0D
+EWXWEXPORT(void,wxGridCellCoordsArray_Item)(wxGridCellCoordsArray* self,in=
t _idx,int* _c,int* _r)=0D
{=0D
hunk ./wxc/src/eljgrid.cpp 24
- *_c =3D ((wxGridCellCoordsArray*)_obj)->Item(_idx).GetCol();=0D
- *_r =3D ((wxGridCellCoordsArray*)_obj)->Item(_idx).GetRow();=0D
+ *_c =3D self->Item(_idx).GetCol();=0D
+ *_r =3D self->Item(_idx).GetRow();=0D
}=0D
=0D
=0D
hunk ./wxc/src/eljgrid.cpp 34
return self->IsCreated();=0D
}=0D
=0D
-EWXWEXPORT(void*,wxGridCellEditor_GetControl)(void* _obj)=0D
+EWXWEXPORT(void*,wxGridCellEditor_GetControl)(wxGridCellEditor* self)=0D
{=0D
hunk ./wxc/src/eljgrid.cpp 36
- return (void*)((wxGridCellEditor*)_obj)->GetControl();=0D
+ return (void*)self->GetControl();=0D
}=0D
=0D
hunk ./wxc/src/eljgrid.cpp 39
-EWXWEXPORT(void,wxGridCellEditor_SetControl)(void* _obj,void* control)=0D
+EWXWEXPORT(void,wxGridCellEditor_SetControl)(wxGridCellEditor* self,wxCont=
rol* control)=0D
{=0D
hunk ./wxc/src/eljgrid.cpp 41
- ((wxGridCellEditor*)_obj)->SetControl((wxControl*) control);=0D
+ self->SetControl(control);=0D
}=0D
=0D
hunk ./wxc/src/eljgrid.cpp 44
-EWXWEXPORT(void,wxGridCellEditor_Create)(void* _obj,wxWindow* parent,int i=
d,void* evtHandler)=0D
+EWXWEXPORT(void,wxGridCellEditor_Create)(wxGridCellEditor* self,wxWindow* =
parent,int id,wxEvtHandler* evtHandler)=0D
{=0D
hunk ./wxc/src/eljgrid.cpp 46
- ((wxGridCellEditor*)_obj)->Create(parent, (wxWindowID) id, (wxEvtHandler*=
) evtHandler);=0D
+ self->Create(parent, (wxWindowID) id, evtHandler);=0D
}=0D
=0D
hunk ./wxc/src/eljgrid.cpp 49
-EWXWEXPORT(void,wxGridCellEditor_SetSize)(void* _obj,int x,int y,int w,int=
h)=0D
+EWXWEXPORT(void,wxGridCellEditor_SetSize)(wxGridCellEditor* self,int x,int=
y,int w,int h)=0D
{=0D
hunk ./wxc/src/eljgrid.cpp 51
- ((wxGridCellEditor*)_obj)->SetSize(wxRect(x, y, w, h));=0D
+ self->SetSize(wxRect(x, y, w, h));=0D
}=0D
=0D
EWXWEXPORT(void,wxGridCellEditor_Show)(wxGridCellEditor* self,bool show,vo=
id* attr)=0D
hunk ./wxc/src/eljgrid.cpp 59
self->Show(show, (wxGridCellAttr*)attr);=0D
}=0D
=0D
-EWXWEXPORT(void,wxGridCellEditor_PaintBackground)(void* _obj,int x,int y,i=
nt w,int h,void* attr)=0D
+EWXWEXPORT(void,wxGridCellEditor_PaintBackground)(wxGridCellEditor* self,i=
nt x,int y,int w,int h,void* attr)=0D
{=0D
hunk ./wxc/src/eljgrid.cpp 61
- ((wxGridCellEditor*)_obj)->PaintBackground(wxRect(x, y, w, h), (wxGridCel=
lAttr*)attr);=0D
+ self->PaintBackground(wxRect(x, y, w, h), (wxGridCellAttr*)attr);=0D
}=0D
=0D
hunk ./wxc/src/eljgrid.cpp 64
-EWXWEXPORT(void,wxGridCellEditor_BeginEdit)(void* _obj,int row,int col,voi=
d* grid)=0D
+EWXWEXPORT(void,wxGridCellEditor_BeginEdit)(wxGridCellEditor* self,int row=
,int col,void* grid)=0D
{=0D
hunk ./wxc/src/eljgrid.cpp 66
- ((wxGridCellEditor*)_obj)->BeginEdit(row, col, (wxGrid*)grid);=0D
+ self->BeginEdit(row, col, (wxGrid*)grid);=0D
}=0D
=0D
EWXWEXPORT(bool,wxGridCellEditor_EndEdit)(wxGridCellEditor* self,int row,i=
nt col,wxGrid* grid)=0D
hunk ./wxc/src/eljgrid.cpp 74
return self->EndEdit(row, col, grid);=0D
}=0D
=0D
-EWXWEXPORT(void,wxGridCellEditor_Reset)(void* _obj)=0D
+EWXWEXPORT(void,wxGridCellEditor_Reset)(wxGridCellEditor* self)=0D
{=0D
hunk ./wxc/src/eljgrid.cpp 76
- ((wxGridCellEditor*)_obj)->Reset();=0D
+ self->Reset();=0D
}=0D
=0D
EWXWEXPORT(bool,wxGridCellEditor_IsAcceptedKey)(wxGridCellEditor* self,wxK=
eyEvent* event)=0D
hunk ./wxc/src/eljgrid.cpp 84
return self->IsAcceptedKey(*event);=0D
}=0D
=0D
-EWXWEXPORT(void,wxGridCellEditor_StartingKey)(void* _obj,void* event)=0D
+EWXWEXPORT(void,wxGridCellEditor_StartingKey)(wxGridCellEditor* self,wxKey=
Event* event)=0D
{=0D
hunk ./wxc/src/eljgrid.cpp 86
- ((wxGridCellEditor*)_obj)->StartingKey(*((wxKeyEvent*)event));=0D
+ self->StartingKey(*event);=0D
}=0D
=0D
hunk ./wxc/src/eljgrid.cpp...
[truncated message content] |