Menu
▾
▴
[wxhaskell-devel] darcs patch: Use wxString_Length function instead of ... (and 3 more)
|
From: shelarcy <she...@gm...> - 2009-01-13 14:19:48
|
DarcsURL: C:/home/shelarcy/wxhaskell MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_" --=_ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Thu Jan 8 23:26:43 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Use wxString_Length function instead of getting wxString twice. Tue Jan 13 18:46:41 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Refactor to use wxString instead of calling WString (wxChar) directly. = This change will be easy to add encoding mode. wxWidget 2.9 and 3.0 will support to build UTF-8 mode. If we use wxChar directly, we must change many part to support this build mode. = http://www.wxwidgets.org/develop/roadmap.htm = And we think we get some advantages from this change. utf8-string package only support UTF-8, so we want to use full unicode support we must write UTF-8 <-> UTF-16 <-> UTF-32 conversion layer, or we must support new UTF-= 8 build mode. = (C++0x and C1x will support new string charactor set types, char16_t and char32_t. Haskell and wxWidgets will support these types if compiler (e.g. gcc, VC) support theirs. If we use abstract layer to use string, we can extend wxHaskell support soonly when compiler and library change.)= = Tue Jan 13 19:47:55 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Remove unused eljtreectrl.cpp. Tue Jan 13 22:57:54 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Add int / C++ bool conversion function in wxc. --=_ Content-Type: text/x-darcs-patch; name="use-wxstring_length-function-instead-of-getting-wxstring-twice_.dpatch" Content-Transfer-Encoding: quoted-printable Content-Description: A darcs patch for your repository! New patches: [Use wxString_Length function instead of getting wxString twice. shelarcy <she...@gm...>**20090108142643 Ignore-this: 2160aa7a6c9e4b5ed07ea0f17be20332 ] { hunk ./wxc/include/wxc.h 100 TClass(wxString) wxString_CreateLen( TString buffer, int len );=0D void wxString_Delete( TSelf(wxString) s );=0D TStringLen wxString_GetString( TSelf(wxString) s, TStringOut buffer = );=0D +size_t wxString_Length( TSelf(wxString) s );=0D = = /* menu */ hunk ./wxc/src/extra.cpp 1481 /*------------------------------------------------------------------------= ----- String --------------------------------------------------------------------------= ---*/ -EWXWEXPORT(wxString*, wxString_Create)( wxChar* buffer ) +typedef char utf8char; + +EWXWEXPORT(wxString*,wxString_Create)(wxChar* buffer) { return new wxString(buffer); } hunk ./wxc/src/extra.cpp 1488 = -EWXWEXPORT(wxString*, wxString_CreateLen)( wxChar* buffer, int len ) +EWXWEXPORT(wxString*,wxString_CreateUTF8)(utf8char* buffer) +{ + return new wxString (buffer,wxConvUTF8); +} + +EWXWEXPORT(wxString*,wxString_CreateLen)(wxChar* buffer,int len) { return new wxString(buffer,len); } hunk ./wxc/src/extra.cpp 1498 = -EWXWEXPORT(void,wxString_Delete)( wxString* s ) +EWXWEXPORT(void,wxString_Delete)(wxString* s) { delete s; } hunk ./wxc/src/extra.cpp 1503 = -EWXWEXPORT(int,wxString_GetString)( wxString* s, wxChar* buffer ) +EWXWEXPORT(int,wxString_GetString)(wxString* s,wxChar* buffer) { if (buffer) memcpy (buffer, s->c_str(), s->Length() * sizeof(wxChar)); return s->Length(); hunk ./wxc/src/extra.cpp 1507 -} = +} + +EWXWEXPORT(size_t,wxString_Length)(wxString* s) +{ + return s->length(); +} + +EWXWEXPORT(wxCharBuffer*,wxString_GetUtf8)(wxString* s) +{ + wxCharBuffer *cb =3D new wxCharBuffer; + *cb =3D s->utf8_str(); + return cb; +} + +EWXWEXPORT(utf8char*,wxCharBuffer_DataUtf8)(wxCharBuffer* cb) +{ + return (utf8char*)cb->data(); +} + +EWXWEXPORT(void,wxCharBuffer_Delete)(wxCharBuffer* cb) +{ + delete cb; +} = /*------------------------------------------------------------------------= ----- classinfo hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 1138 withManagedStringResult :: IO (Ptr (TWxString a)) -> IO String withManagedStringResult io =3D do wxs <- io - s <- withWStringResult (wxString_GetString wxs) + len <- wxString_Length wxs + s <- if (len<=3D0) + then return "" + else withCWString (replicate (fromCInt len) ' ') $ \cstr -= > + do wxString_GetString wxs cstr + peekCWStringLen (cstr, fromCInt len) wxString_Delete wxs return s = hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 1148 = -foreign import ccall "wxString_Create" wxString_Create :: Ptr CWchar= -> IO (Ptr (TWxString a)) -foreign import ccall "wxString_CreateLen" wxString_CreateLen :: Ptr CWchar= -> CInt -> IO (Ptr (TWxString a)) -foreign import ccall "wxString_Delete" wxString_Delete :: Ptr (TWxSt= ring a) -> IO () -foreign import ccall "wxString_GetString" wxString_GetString :: Ptr (TWxSt= ring a) -> Ptr CWchar -> IO CInt +foreign import ccall wxString_Create :: Ptr CWchar -> IO (Ptr (TWxStrin= g a)) +foreign import ccall wxString_CreateLen :: Ptr CWchar -> CInt -> IO (Ptr (= TWxString a)) +foreign import ccall wxString_Delete :: Ptr (TWxString a) -> IO () +foreign import ccall wxString_GetString :: Ptr (TWxString a) -> Ptr CWchar= -> IO CInt +foreign import ccall wxString_Length :: Ptr (TWxString a) -> IO CInt = = {-------------------------------------------------------------------------= ---------------- } [Refactor to use wxString instead of calling WString (wxChar) directly. shelarcy <she...@gm...>**20090113094641 = This change will be easy to add encoding mode. wxWidget 2.9 and 3.0 will support to build UTF-8 mode. If we use wxChar directly, we must change many part to support this build mode. = http://www.wxwidgets.org/develop/roadmap.htm = And we think we get some advantages from this change. utf8-string package only support UTF-8, so we want to use full unicode support we must write UTF-8 <-> UTF-16 <-> UTF-32 conversion layer, or we must support new UTF-8 build mode. = (C++0x and C1x will support new string charactor set types, char16_t and char32_t. Haskell and wxWidgets will support these types if compiler (e.g. gcc, VC) support theirs. If we use abstract layer to use string, we can extend wxHaskell support soonly when compiler and library change.) = ] { hunk ./wx/src/Graphics/UI/WX/Draw.hs 209 drawBitmap dc bitmap point transparent props =3D if bitmap =3D=3D nullBitmap || objectIsNull bitmap = then return () - else do ok <- bitmapOk bitmap + else do ok <- bitmapIsOk bitmap if not ok = then return () else dcWith dc props (dcDrawBitmap dc bitmap point transpare= nt) hunk ./wxc/include/printout.h 20 void wxPrintout_GetPPIScreen( TSelf(wxPrintout) _obj, TPointOutVoid(= _x,_y) );=0D void wxPrintout_GetPageSizeMM( TSelf(wxPrintout) _obj, TSizeOutVoid(= _w,_h) );=0D void wxPrintout_GetPageSizePixels( TSelf(wxPrintout) _obj, TSizeOutV= oid(_w,_h) );=0D -TStringLen wxPrintout_GetTitle( TSelf(wxPrintout) _obj, TStringOutVoid _bu= f );=0D +TClass(wxString) wxPrintout_GetTitle( TSelf(wxPrintout) _obj );=0D TBool wxPrintout_IsPreview( TSelf(wxPrintout) _obj );=0D void wxPrintout_SetDC( TSelf(wxPrintout) _obj, TClass(wxDC) dc );=0D void wxPrintout_SetIsPreview( TSelf(wxPrintout) _obj, TBoolInt p );= =0D hunk ./wxc/include/stc.h 6 = /* wxStyledTextCtrl */ TClassDefExtend(wxStyledTextCtrl,wxControl) -TClass(wxStyledTextCtrl) wxStyledTextCtrl_Create( TClass(wxWindow) _prt, i= nt _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int style ); +TClass(wxStyledTextCtrl) wxStyledTextCtrl_Create( TClass(wxWindow) _prt, i= nt _id, TClass(wxString) _txt, TRect(_lft,_top,_wdt,_hgt), int style ); = = /* tricky handwritten functions */ hunk ./wxc/include/stc_gen.h 1 -void wxStyledTextCtrl_AddText(TSelf(wxStyledTextCtrl) _obj, TString text);= =0D +void wxStyledTextCtrl_AddText(TSelf(wxStyledTextCtrl) _obj, TClass(wxStrin= g) text);=0D =0D void wxStyledTextCtrl_AddStyledText(TSelf(wxStyledTextCtrl) _obj, TClass(w= xMemoryBuffer) data);=0D =0D hunk ./wxc/include/stc_gen.h 5 -void wxStyledTextCtrl_InsertText(TSelf(wxStyledTextCtrl) _obj, int pos, TS= tring text);=0D +void wxStyledTextCtrl_InsertText(TSelf(wxStyledTextCtrl) _obj, int pos, TC= lass(wxString) text);=0D =0D void wxStyledTextCtrl_ClearAll(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 121 =0D void wxStyledTextCtrl_StyleSetSize(TSelf(wxStyledTextCtrl) _obj, int style= , int sizePoints);=0D =0D -void wxStyledTextCtrl_StyleSetFaceName(TSelf(wxStyledTextCtrl) _obj, int s= tyle, TString fontName);=0D +void wxStyledTextCtrl_StyleSetFaceName(TSelf(wxStyledTextCtrl) _obj, int s= tyle, TClass(wxString) fontName);=0D =0D void wxStyledTextCtrl_StyleSetEOLFilled(TSelf(wxStyledTextCtrl) _obj, int = style, TBool filled);=0D =0D hunk ./wxc/include/stc_gen.h 147 =0D void wxStyledTextCtrl_CmdKeyClearAll(TSelf(wxStyledTextCtrl) _obj);=0D =0D -void wxStyledTextCtrl_SetStyleBytes(TSelf(wxStyledTextCtrl) _obj, int leng= th, TString styleBytes);=0D +void wxStyledTextCtrl_SetStyleBytes(TSelf(wxStyledTextCtrl) _obj, int leng= th, char* styleBytes);=0D =0D void wxStyledTextCtrl_StyleSetVisible(TSelf(wxStyledTextCtrl) _obj, int st= yle, TBool visible);=0D =0D hunk ./wxc/include/stc_gen.h 155 =0D void wxStyledTextCtrl_SetCaretPeriod(TSelf(wxStyledTextCtrl) _obj, int per= iodMilliseconds);=0D =0D -void wxStyledTextCtrl_SetWordChars(TSelf(wxStyledTextCtrl) _obj, TString c= haracters);=0D +void wxStyledTextCtrl_SetWordChars(TSelf(wxStyledTextCtrl) _obj, TClass(wx= String) characters);=0D =0D void wxStyledTextCtrl_BeginUndoAction(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 187 =0D void wxStyledTextCtrl_StyleSetChangeable(TSelf(wxStyledTextCtrl) _obj, int= style, TBool changeable);=0D =0D -void wxStyledTextCtrl_AutoCompShow(TSelf(wxStyledTextCtrl) _obj, int lenEn= tered, TString itemList);=0D +void wxStyledTextCtrl_AutoCompShow(TSelf(wxStyledTextCtrl) _obj, int lenEn= tered, TClass(wxString) itemList);=0D =0D void wxStyledTextCtrl_AutoCompCancel(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 197 =0D void wxStyledTextCtrl_AutoCompComplete(TSelf(wxStyledTextCtrl) _obj);=0D =0D -void wxStyledTextCtrl_AutoCompStops(TSelf(wxStyledTextCtrl) _obj, TString = characterSet);=0D +void wxStyledTextCtrl_AutoCompStops(TSelf(wxStyledTextCtrl) _obj, TClass(w= xString) characterSet);=0D =0D void wxStyledTextCtrl_AutoCompSetSeparator(TSelf(wxStyledTextCtrl) _obj, i= nt separatorCharacter);=0D =0D hunk ./wxc/include/stc_gen.h 203 int wxStyledTextCtrl_AutoCompGetSeparator(TSelf(wxStyledTextCtrl) _obj);= =0D =0D -void wxStyledTextCtrl_AutoCompSelect(TSelf(wxStyledTextCtrl) _obj, TString= text);=0D +void wxStyledTextCtrl_AutoCompSelect(TSelf(wxStyledTextCtrl) _obj, TClass(= wxString) text);=0D =0D void wxStyledTextCtrl_AutoCompSetCancelAtStart(TSelf(wxStyledTextCtrl) _ob= j, TBool cancel);=0D =0D hunk ./wxc/include/stc_gen.h 209 TBool wxStyledTextCtrl_AutoCompGetCancelAtStart(TSelf(wxStyledTextCtrl) _o= bj);=0D =0D -void wxStyledTextCtrl_AutoCompSetFillUps(TSelf(wxStyledTextCtrl) _obj, TSt= ring characterSet);=0D +void wxStyledTextCtrl_AutoCompSetFillUps(TSelf(wxStyledTextCtrl) _obj, TCl= ass(wxString) characterSet);=0D =0D void wxStyledTextCtrl_AutoCompSetChooseSingle(TSelf(wxStyledTextCtrl) _obj= , TBool chooseSingle);=0D =0D hunk ./wxc/include/stc_gen.h 219 =0D TBool wxStyledTextCtrl_AutoCompGetIgnoreCase(TSelf(wxStyledTextCtrl) _obj)= ;=0D =0D -void wxStyledTextCtrl_UserListShow(TSelf(wxStyledTextCtrl) _obj, int listT= ype, TString itemList);=0D +void wxStyledTextCtrl_UserListShow(TSelf(wxStyledTextCtrl) _obj, int listT= ype, TClass(wxString) itemList);=0D =0D void wxStyledTextCtrl_AutoCompSetAutoHide(TSelf(wxStyledTextCtrl) _obj, TB= ool autoHide);=0D =0D hunk ./wxc/include/stc_gen.h 289 =0D int wxStyledTextCtrl_GetPrintColourMode(TSelf(wxStyledTextCtrl) _obj);=0D =0D -int wxStyledTextCtrl_FindText(TSelf(wxStyledTextCtrl) _obj, int minPos, in= t maxPos, TString text, int flags);=0D +int wxStyledTextCtrl_FindText(TSelf(wxStyledTextCtrl) _obj, int minPos, in= t maxPos, TClass(wxString) text, int flags);=0D =0D int wxStyledTextCtrl_FormatRange(TSelf(wxStyledTextCtrl) _obj, TBool doDra= w, int startPos, int endPos, TClass(wxDC) draw, TClass(wxDC) target, TClass= (wxRect) renderRect, TClass(wxRect) pageRect);=0D =0D hunk ./wxc/include/stc_gen.h 319 =0D void wxStyledTextCtrl_EnsureCaretVisible(TSelf(wxStyledTextCtrl) _obj);=0D =0D -void wxStyledTextCtrl_ReplaceSelection(TSelf(wxStyledTextCtrl) _obj, TStri= ng text);=0D +void wxStyledTextCtrl_ReplaceSelection(TSelf(wxStyledTextCtrl) _obj, TClas= s(wxString) text);=0D =0D void wxStyledTextCtrl_SetReadOnly(TSelf(wxStyledTextCtrl) _obj, TBool read= Only);=0D =0D hunk ./wxc/include/stc_gen.h 339 =0D void wxStyledTextCtrl_Clear(TSelf(wxStyledTextCtrl) _obj);=0D =0D -void wxStyledTextCtrl_SetText(TSelf(wxStyledTextCtrl) _obj, TString text);= =0D +void wxStyledTextCtrl_SetText(TSelf(wxStyledTextCtrl) _obj, TClass(wxStrin= g) text);=0D =0D int wxStyledTextCtrl_GetTextLength(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 359 =0D int wxStyledTextCtrl_GetTargetEnd(TSelf(wxStyledTextCtrl) _obj);=0D =0D -int wxStyledTextCtrl_ReplaceTarget(TSelf(wxStyledTextCtrl) _obj, TString t= ext);=0D +int wxStyledTextCtrl_ReplaceTarget(TSelf(wxStyledTextCtrl) _obj, TClass(wx= String) text);=0D =0D hunk ./wxc/include/stc_gen.h 361 -int wxStyledTextCtrl_ReplaceTargetRE(TSelf(wxStyledTextCtrl) _obj, TString= text);=0D +int wxStyledTextCtrl_ReplaceTargetRE(TSelf(wxStyledTextCtrl) _obj, TClass(= wxString) text);=0D =0D hunk ./wxc/include/stc_gen.h 363 -int wxStyledTextCtrl_SearchInTarget(TSelf(wxStyledTextCtrl) _obj, TString = text);=0D +int wxStyledTextCtrl_SearchInTarget(TSelf(wxStyledTextCtrl) _obj, TClass(w= xString) text);=0D =0D void wxStyledTextCtrl_SetSearchFlags(TSelf(wxStyledTextCtrl) _obj, int fla= gs);=0D =0D hunk ./wxc/include/stc_gen.h 369 int wxStyledTextCtrl_GetSearchFlags(TSelf(wxStyledTextCtrl) _obj);=0D =0D -void wxStyledTextCtrl_CallTipShow(TSelf(wxStyledTextCtrl) _obj, int pos, T= String definition);=0D +void wxStyledTextCtrl_CallTipShow(TSelf(wxStyledTextCtrl) _obj, int pos, T= Class(wxString) definition);=0D =0D void wxStyledTextCtrl_CallTipCancel(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 443 =0D int wxStyledTextCtrl_GetScrollWidth(TSelf(wxStyledTextCtrl) _obj);=0D =0D -int wxStyledTextCtrl_TextWidth(TSelf(wxStyledTextCtrl) _obj, int style, TS= tring text);=0D +int wxStyledTextCtrl_TextWidth(TSelf(wxStyledTextCtrl) _obj, int style, TC= lass(wxString) text);=0D =0D void wxStyledTextCtrl_SetEndAtLastLine(TSelf(wxStyledTextCtrl) _obj, TBool= endAtLastLine);=0D =0D hunk ./wxc/include/stc_gen.h 455 =0D TBool wxStyledTextCtrl_GetUseVerticalScrollBar(TSelf(wxStyledTextCtrl) _ob= j);=0D =0D -void wxStyledTextCtrl_AppendText(TSelf(wxStyledTextCtrl) _obj, TString tex= t);=0D +void wxStyledTextCtrl_AppendText(TSelf(wxStyledTextCtrl) _obj, TClass(wxSt= ring) text);=0D =0D TBool wxStyledTextCtrl_GetTwoPhaseDraw(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 513 =0D void wxStyledTextCtrl_SearchAnchor(TSelf(wxStyledTextCtrl) _obj);=0D =0D -int wxStyledTextCtrl_SearchNext(TSelf(wxStyledTextCtrl) _obj, int flags, T= String text);=0D +int wxStyledTextCtrl_SearchNext(TSelf(wxStyledTextCtrl) _obj, int flags, T= Class(wxString) text);=0D =0D hunk ./wxc/include/stc_gen.h 515 -int wxStyledTextCtrl_SearchPrev(TSelf(wxStyledTextCtrl) _obj, int flags, T= String text);=0D +int wxStyledTextCtrl_SearchPrev(TSelf(wxStyledTextCtrl) _obj, int flags, T= Class(wxString) text);=0D =0D int wxStyledTextCtrl_LinesOnScreen(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 593 =0D void wxStyledTextCtrl_CopyRange(TSelf(wxStyledTextCtrl) _obj, int start, i= nt end);=0D =0D -void wxStyledTextCtrl_CopyText(TSelf(wxStyledTextCtrl) _obj, int length, T= String text);=0D +void wxStyledTextCtrl_CopyText(TSelf(wxStyledTextCtrl) _obj, int length, T= Class(wxString) text);=0D =0D void wxStyledTextCtrl_StartRecord(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 605 =0D void wxStyledTextCtrl_Colourise(TSelf(wxStyledTextCtrl) _obj, int start, i= nt end);=0D =0D -void wxStyledTextCtrl_SetProperty(TSelf(wxStyledTextCtrl) _obj, TString ke= y, TString value);=0D +void wxStyledTextCtrl_SetProperty(TSelf(wxStyledTextCtrl) _obj, TClass(wxS= tring) key, TClass(wxString) value);=0D =0D hunk ./wxc/include/stc_gen.h 607 -void wxStyledTextCtrl_SetKeyWords(TSelf(wxStyledTextCtrl) _obj, int keywor= dSet, TString keyWords);=0D +void wxStyledTextCtrl_SetKeyWords(TSelf(wxStyledTextCtrl) _obj, int keywor= dSet, TClass(wxString) keyWords);=0D =0D hunk ./wxc/include/stc_gen.h 609 -void wxStyledTextCtrl_SetLexerLanguage(TSelf(wxStyledTextCtrl) _obj, TStri= ng language);=0D +void wxStyledTextCtrl_SetLexerLanguage(TSelf(wxStyledTextCtrl) _obj, TClas= s(wxString) language);=0D =0D int wxStyledTextCtrl_GetCurrentLine(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 613 -void wxStyledTextCtrl_StyleSetSpec(TSelf(wxStyledTextCtrl) _obj, int style= Num, TString spec);=0D +void wxStyledTextCtrl_StyleSetSpec(TSelf(wxStyledTextCtrl) _obj, int style= Num, TClass(wxString) spec);=0D =0D void wxStyledTextCtrl_StyleSetFont(TSelf(wxStyledTextCtrl) _obj, int style= Num, TClass(wxFont) font);=0D =0D hunk ./wxc/include/stc_gen.h 617 -void wxStyledTextCtrl_StyleSetFontAttr(TSelf(wxStyledTextCtrl) _obj, int s= tyleNum, int size, TString faceName, TBool bold, TBool italic, TBool underl= ine);=0D +void wxStyledTextCtrl_StyleSetFontAttr(TSelf(wxStyledTextCtrl) _obj, int s= tyleNum, int size, TClass(wxString) faceName, TBool bold, TBool italic, TBo= ol underline);=0D =0D void wxStyledTextCtrl_CmdKeyExecute(TSelf(wxStyledTextCtrl) _obj, int cmd)= ;=0D =0D hunk ./wxc/include/stc_gen.h 637 =0D void wxStyledTextCtrl_SetLastKeydownProcessed(TSelf(wxStyledTextCtrl) _obj= , TBool val);=0D =0D -TBool wxStyledTextCtrl_SaveFile(TSelf(wxStyledTextCtrl) _obj, TString file= name);=0D +TBool wxStyledTextCtrl_SaveFile(TSelf(wxStyledTextCtrl) _obj, TClass(wxStr= ing) filename);=0D =0D hunk ./wxc/include/stc_gen.h 639 -TBool wxStyledTextCtrl_LoadFile(TSelf(wxStyledTextCtrl) _obj, TString file= name);=0D +TBool wxStyledTextCtrl_LoadFile(TSelf(wxStyledTextCtrl) _obj, TClass(wxStr= ing) filename);=0D hunk ./wxc/include/wxc.h 66 void wxObject_Delete( TSelf(wxObject) obj );=0D = /* Frame */ -TStringLen wxFrame_GetTitle( TSelf(wxFrame) _obj, TStringOutVoid _buf ); -void wxFrame_SetTitle( TSelf(wxFrame) _frame, TString _txt ); +TClass(wxString) wxFrame_GetTitle( TSelf(wxFrame) _obj ); +void wxFrame_SetTitle( TSelf(wxFrame) _frame, TClass(wxString) _txt= ); TBool wxFrame_SetShape( TSelf(wxFrame) self, TClass(wxRegion) region= );=0D TBool wxFrame_ShowFullScreen( TSelf(wxFrame) self, TBool show, int s= tyle);=0D TBool wxFrame_IsFullScreen( TSelf(wxFrame) self );=0D hunk ./wxc/include/wxc.h 145 void wxTreeEvent_Allow( TSelf(wxTreeEvent) _obj);=0D =0D TClass(wxTreeCtrl) wxTreeCtrl_Create2( TClass(wxWindow) _prt, int _id, TRe= ct(_lft,_top,_wdt,_hgt), int _stl );=0D -void wxTreeCtrl_InsertItem2( TSelf(wxTreeCtrl) _obj, TClass(wxWindow) pa= rent, TClass(wxTreeItemId) idPrevious, TStringVoid text, int image, int sel= ectedImage, TClass(wxClosure) closure, TClassRef(wxTreeItemId) _item );=0D -void wxTreeCtrl_InsertItemByIndex2( TSelf(wxTreeCtrl) _obj, TClass(wxWin= dow) parent, int index, TStringVoid text, int image, int selectedImage, TCl= ass(wxClosure) closure, TClassRef(wxTreeItemId) _item );=0D +void wxTreeCtrl_InsertItem2( TSelf(wxTreeCtrl) _obj, TClass(wxWindow) pa= rent, TClass(wxTreeItemId) idPrevious, TClass(wxString) text, int image, in= t selectedImage, TClass(wxClosure) closure, TClassRef(wxTreeItemId) _item )= ;=0D +void wxTreeCtrl_InsertItemByIndex2( TSelf(wxTreeCtrl) _obj, TClass(wxWin= dow) parent, int index, TClass(wxString) text, int image, int selectedImage= , TClass(wxClosure) closure, TClassRef(wxTreeItemId) _item );=0D TClass(wxClosure) wxTreeCtrl_GetItemClientClosure( TSelf(wxTreeCtrl) _obj= , TClass(wxTreeItemId) item );=0D void wxTreeCtrl_SetItemClientClosure( TSelf(wxTreeCtrl) _obj, TClass(wxT= reeItemId) item, TClass(wxClosure) closure );=0D void wxTreeCtrl_AssignImageList(TSelf(wxTreeCtrl) _obj, TClass(wxImageLi= st) imageList );=0D hunk ./wxc/include/wxc.h 171 = /* wxClassInfo */ TClassDef(wxClassInfo) -TClass(wxClassInfo) wxClassInfo_FindClass( TString _txt ); -TStringLen wxClassInfo_GetBaseClassName1( TSelf(wxClassInfo) _obj, TStrin= gOutVoid _buf ); -TStringLen wxClassInfo_GetBaseClassName2( TSelf(wxClassInfo) _obj, TStrin= gOutVoid _buf ); -TStringLen wxClassInfo_GetClassNameEx( TSelf(wxClassInfo) _obj, TStringOu= tVoid _buf ); +TClass(wxClassInfo) wxClassInfo_FindClass( TClass(wxString) _txt ); +TClass(wxString) wxClassInfo_GetBaseClassName1( TSelf(wxClassInfo) _obj ); +TClass(wxString) wxClassInfo_GetBaseClassName2( TSelf(wxClassInfo) _obj ); +TClass(wxString) wxClassInfo_GetClassNameEx( TSelf(wxClassInfo) _obj ); int wxClassInfo_GetSize( TSelf(wxClassInfo) _obj ); TBool wxClassInfo_IsKindOfEx( TSelf(wxClassInfo) _obj, TClass(wxClas= sInfo) classInfo ); = hunk ./wxc/include/wxc.h 188 TClass(wxClosure) wxTimerEx_GetClosure( TSelf(wxTimerEx) _obj ); = /* Menu */=0D -void wxMenu_AppendRadioItem( TSelf(wxMenu) self, int id, TString text, TS= tring help);=0D +void wxMenu_AppendRadioItem( TSelf(wxMenu) self, int id, TClass(wxString)= text, TClass(wxString) help);=0D =0D =0D /* Menu Item */ hunk ./wxc/include/wxc.h 193 TClass(wxMenuItem) wxMenuItem_CreateSeparator(); -TClass(wxMenuItem) wxMenuItem_CreateEx(int id, TString label, TString hel= p, int itemkind, TClass(wxMenu) submenu); +TClass(wxMenuItem) wxMenuItem_CreateEx(int id, TClass(wxString) label, TC= lass(wxString) help, int itemkind, TClass(wxMenu) submenu); =0D /* Toolbar */=0D hunk ./wxc/include/wxc.h 196 -void wxToolBar_AddTool2( TSelf(wxToolBar) _obj, int toolId, TString label,= TClass(wxBitmap) bmp, TClass(wxBitmap) bmpDisabled, int itemKind, TString = shortHelp, TString longHelp );=0D +void wxToolBar_AddTool2( TSelf(wxToolBar) _obj, int toolId, TClass(wxStrin= g) label, TClass(wxBitmap) bmp, TClass(wxBitmap) bmpDisabled, int itemKind,= TClass(wxString) shortHelp, TClass(wxString) longHelp );=0D = /* Progress dialog */ hunk ./wxc/include/wxc.h 199 -TClass(wxProgressDialog) wxProgressDialog_Create( TString title, TString m= essage, int max, TClass(wxWindow) parent, int style ); +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 ); hunk ./wxc/include/wxc.h 201 -int wxProgressDialog_UpdateWithMessage( TSelf(wxProgressDialog) obj, int = value, TString message ); +int 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 253 = /* html window */ TClassDefExtend(wxcHtmlWindow,wxHtmlWindow) -TClass(wxcHtmlWindow) wxcHtmlWindow_Create( TClass(wxWindow) _prt, int _id= , TRect(_lft,_top,_wdt,_hgt), int _stl, TString _txt ); +TClass(wxcHtmlWindow) wxcHtmlWindow_Create( TClass(wxWindow) _prt, int _id= , TRect(_lft,_top,_wdt,_hgt), int _stl, TClass(wxString) _txt ); = hunk ./wxc/include/wxc.h 255 -TClass(wxHtmlWindow) wxHtmlWindow_Create( TClass(wxWindow) _prt, int _id, = TRect(_lft,_top,_wdt,_hgt), int _stl, TString _txt ); -TBool wxHtmlWindow_AppendToPage( TSelf(wxHtmlWindow) _obj, = TString source ); +TClass(wxHtmlWindow) wxHtmlWindow_Create( TClass(wxWindow) _prt, int _id, = TRect(_lft,_top,_wdt,_hgt), int _stl, TClass(wxString) _txt ); +TBool wxHtmlWindow_AppendToPage( TSelf(wxHtmlWindow) _obj, = TClass(wxString) source ); TClass(wxHtmlContainerCell) wxHtmlWindow_GetInternalRepresentation( TSelf(= wxHtmlWindow) _obj ); TStringLen wxHtmlWindow_GetOpenedAnchor( TSelf(wxHtmlWindow) _ob= j, TStringOutVoid _buf ) ; TStringLen wxHtmlWindow_GetOpenedPage( TSelf(wxHtmlWindow) _obj,= TStringOutVoid _buf ); hunk ./wxc/include/wxc.h 267 TBool wxHtmlWindow_HistoryCanForward( TSelf(wxHtmlWindow) _= obj ); void wxHtmlWindow_HistoryClear( TSelf(wxHtmlWindow) _obj); TBool wxHtmlWindow_HistoryForward( TSelf(wxHtmlWindow) _obj= ); -TBool wxHtmlWindow_LoadPage( TSelf(wxHtmlWindow) _obj, TStr= ing location ); -void wxHtmlWindow_ReadCustomization( TSelf(wxHtmlWindow) _= obj, TClass(wxConfigBase) cfg, TString path); +TBool wxHtmlWindow_LoadPage( TSelf(wxHtmlWindow) _obj, TCla= ss(wxString) location ); +void wxHtmlWindow_ReadCustomization( TSelf(wxHtmlWindow) _= obj, TClass(wxConfigBase) cfg, TClass(wxString) path); void wxHtmlWindow_SetBorders( TSelf(wxHtmlWindow) _obj, in= t b ); hunk ./wxc/include/wxc.h 270 -void wxHtmlWindow_SetFonts( TSelf(wxHtmlWindow) _obj, TStr= ing normal_face, TString fixed_face, int * sizes ); -void wxHtmlWindow_SetPage( TSelf(wxHtmlWindow) _obj, TStri= ng source ); -void wxHtmlWindow_SetRelatedFrame( TSelf(wxHtmlWindow) _ob= j , TClass(wxFrame) frame, TString format ); +void wxHtmlWindow_SetFonts( TSelf(wxHtmlWindow) _obj, TCla= ss(wxString) normal_face, TClass(wxString) fixed_face, int * sizes ); +void wxHtmlWindow_SetPage( TSelf(wxHtmlWindow) _obj, TClas= s(wxString) source ); +void wxHtmlWindow_SetRelatedFrame( TSelf(wxHtmlWindow) _ob= j , TClass(wxFrame) frame, TClass(wxString) format ); void wxHtmlWindow_SetRelatedStatusBar( TSelf(wxHtmlWindow)= _obj, int bar); hunk ./wxc/include/wxc.h 274 -void wxHtmlWindow_WriteCustomization( TSelf(wxHtmlWindow) = _obj, TClass(wxConfigBase) cfg, TString path ); +void wxHtmlWindow_WriteCustomization( TSelf(wxHtmlWindow) = _obj, TClass(wxConfigBase) cfg, TClass(wxString) path ); = /* wxGridCellTextEnterEditor */=0D TClassDefExtend(wxGridCellTextEnterEditor,wxGridCellTextEditor)=0D hunk ./wxc/include/wxc.h 288 TClass(wxLogWindow) wxLogWindow_Create( TClass(wxWindow) parent, TString= title, TBoolInt showit, TBoolInt passthrough ); TClass(wxFrame) wxLogWindow_GetFrame( TSelf(wxLogWindow) obj ); = -void LogError(TStringVoid _msg); -void LogFatalError(TStringVoid _msg); -void LogWarning(TStringVoid _msg); -void LogMessage(TStringVoid _msg); -void LogVerbose(TStringVoid _msg); -void LogStatus(TStringVoid _msg); -void LogSysError(TStringVoid _msg); -void LogDebug(TStringVoid _msg); -void LogTrace(TStringVoid mask, TStringVoid _msg); +void LogError(TClass(wxString) _msg); +void LogFatalError(TClass(wxString) _msg); +void LogWarning(TClass(wxString) _msg); +void LogMessage(TClass(wxString) _msg); +void LogVerbose(TClass(wxString) _msg); +void LogStatus(TClass(wxString) _msg); +void LogSysError(TClass(wxString) _msg); +void LogDebug(TClass(wxString) _msg); +void LogTrace(TClass(wxString) mask, TClass(wxString) _msg); = hunk ./wxc/include/wxc.h 298 -void wxLog_AddTraceMask( TSelf(wxLog) _obj, TStringVoid str ); +void wxLog_AddTraceMask( TSelf(wxLog) _obj, TClass(wxString) str ); void wxLog_Delete( TSelf(wxLog) _obj ); void wxLog_DontCreateOnDemand( TSelf(wxLog) _obj ); void wxLog_Flush( TSelf(wxLog) _obj ); hunk ./wxc/include/wxc.h 310 TBool wxLog_HasPendingMessages( TSelf(wxLog) _obj ); TBool wxLog_IsAllowedTraceMask( TSelf(wxLog) _obj, TClass(wxMask) mas= k ); void wxLog_OnLog( TSelf(wxLog) _obj, int level, TStringVoid szString= , int t ); -void wxLog_RemoveTraceMask( TSelf(wxLog) _obj, TStringVoid str ); +void wxLog_RemoveTraceMask( TSelf(wxLog) _obj, TClass(wxString) str = ); void wxLog_Resume( TSelf(wxLog) _obj ); TClass(wxLog) wxLog_SetActiveTarget( TSelf(wxLog) pLogger ); void wxLog_SetTimestamp( TSelf(wxLog) _obj, TStringVoid ts ); hunk ./wxc/include/wxc.h 320 = = /* process */ -TClass(wxProcess) wxProcess_Open( TString cmd, int flags ); +TClass(wxProcess) wxProcess_Open( TClass(wxString) cmd, int flags ); TBool wxProcess_IsErrorAvailable( TSelf(wxProcess) _obj ); TBool wxProcess_IsInputAvailable( TSelf(wxProcess) _obj ); TBool wxProcess_IsInputOpened( TSelf(wxProcess) _obj ); hunk ./wxc/include/wxc.h 333 void wxGetFontFromUser(TClass(wxWindow) parent, TClass(wxFont) font= Init, TClassRef(wxFont) font ); TStringLen wxGetPasswordFromUser(TString message, TString caption, TStrin= g defaultText, TClass(wxWindow) parent, TStringOut _buf ); TStringLen wxGetTextFromUser(TString message, TString caption, TString de= faultText, TClass(wxWindow) parent, TPoint(x,y), TBool center, TStringOut _= buf ); -long wxGetNumberFromUser( TString message, TString prompt, TString = caption, long value, long min, long max, TClass(wxWindow) parent, TPoint(x,= y) ); +long wxGetNumberFromUser( TClass(wxString) message, TClass(wxString= ) prompt, TClass(wxString) caption, long value, long min, long max, TClass(= wxWindow) parent, TPoint(x,y) ); void wxcBell(); void wxcBeginBusyCursor(); void wxcEndBusyCursor(); hunk ./wxc/include/wxc.h 342 /* text ctrl */ TBool wxTextCtrl_EmulateKeyPress( TSelf(wxTextCtrl) _obj, TC= lass(wxKeyEvent) keyevent); TClass (wxTextAttr) wxTextCtrl_GetDefaultStyle( TSelf(wxTextCtrl) _obj ); -TStringLen wxTextCtrl_GetRange( TSelf(wxTextCtrl) _obj, long from= , long to, TStringOutVoid _buf ); -TStringLen wxTextCtrl_GetStringSelection( TSelf(wxTextCtrl) _obj,= TStringOutVoid _buf ); +TClass(wxString) wxTextCtrl_GetRange( TSelf(wxTextCtrl) _obj, long from= , long to ); +TClass(wxString) wxTextCtrl_GetStringSelection( TSelf(wxTextCtrl) _obj = ); TBool wxTextCtrl_IsMultiLine( TSelf(wxTextCtrl) _obj ); TBool wxTextCtrl_IsSingleLine( TSelf(wxTextCtrl) _obj ); TBool wxTextCtrl_SetDefaultStyle( TSelf(wxTextCtrl) _obj, TC= lass(wxTextAttr) style); hunk ./wxc/include/wxc.h 409 =0D /* application directory */=0D /** Return the directory of the application. On unix systems (except MacOS= X), it is not always possible to determine this correctly. Therefore, the = APPDIR environment variable is returned first if it is defined. */=0D -TStringLen wxGetApplicationDir( TStringOut buffer);=0D +TClass(wxString) wxGetApplicationDir();=0D /** Return the full path of the application. On unix systems (except MacOS= X), it is not always possible to determine this correctly. */=0D hunk ./wxc/include/wxc.h 411 -TStringLen wxGetApplicationPath( TStringOut buffer);=0D +TClass(wxString) wxGetApplicationPath();=0D =0D /* ELJApp */ void ELJApp_InitializeC( TClass(wxClosure) closure, int _argc, TChar** _a= rgv );=0D hunk ./wxc/include/wxc_glue.h 350 /* Misc. */=0D int ELJSysErrorCode( );=0D void* ELJSysErrorMsg( int nErrCode );=0D -void LogErrorMsg( TStringVoid _msg );=0D -void LogFatalErrorMsg( TStringVoid _msg );=0D -void LogMessageMsg( TStringVoid _msg );=0D -void LogWarningMsg( TStringVoid _msg );=0D +void LogErrorMsg( TClass(wxString) _msg );=0D +void LogFatalErrorMsg( TClass(wxString) _msg );=0D +void LogMessageMsg( TClass(wxString) _msg );=0D +void LogWarningMsg( TClass(wxString) _msg );=0D TBool Quantize( TClass(wxImage) src, TClass(wxImage) dest, int desire= dNoColours, void* eightBitData, int flags );=0D TBool QuantizePalette( TClass(wxImage) src, TClass(wxImage) dest, voi= d* pPalette, int desiredNoColours, void* eightBitData, int flags );=0D void wxCFree( void* _ptr );=0D hunk ./wxc/include/wxc_glue.h 370 void ELJApp_DisplaySize( TSizeOutVoid(_w,_h) );=0D void ELJApp_EnableTooltips( TBool _enable );=0D void ELJApp_EnableTopLevelWindows( int _enb );=0D -int ELJApp_ExecuteProcess( TStringVoid _cmd, int _snc, TClass(wxPro= cess) _prc );=0D +int ELJApp_ExecuteProcess( TClass(wxString) _cmd, int _snc, TClass(= wxProcess) _prc );=0D void ELJApp_Exit( );=0D void ELJApp_ExitMainLoop( );=0D void* ELJApp_FindWindowById( int _id, TClass(wxWindow) _prt );=0D hunk ./wxc/include/wxc_glue.h 374 -TClass(wxWindow) ELJApp_FindWindowByLabel( TStringVoid _lbl, TClass(wxWind= ow) _prt );=0D -TClass(wxWindow) ELJApp_FindWindowByName( TStringVoid _lbl, TClass(wxWindo= w) _prt );=0D +TClass(wxWindow) ELJApp_FindWindowByLabel( TClass(wxString) _lbl, TClass(w= xWindow) _prt );=0D +TClass(wxWindow) ELJApp_FindWindowByName( TClass(wxString) _lbl, TClass(wx= Window) _prt );=0D TClass(wxApp) ELJApp_GetApp( );=0D hunk ./wxc/include/wxc_glue.h 377 -TStringLen ELJApp_GetAppName( TStringOutVoid _buf );=0D -TStringLen ELJApp_GetClassName( TStringOutVoid _buf );=0D -int ELJApp_GetExitOnFrameDelete( );=0D -TStringLen ELJApp_GetOsDescription( TStringOutVoid _buf );=0D +TClass(wxString) ELJApp_GetAppName( );=0D +TClass(wxString) ELJApp_GetClassName( );=0D +int ELJApp_GetExitOnFrameDelete( );=0D +TClass(wxString) ELJApp_GetOsDescription( );=0D int ELJApp_GetOsVersion( void* _maj, void* _min );=0D TClass(wxWindow) ELJApp_GetTopWindow( );=0D int ELJApp_GetUseBestVisual( );=0D hunk ./wxc/include/wxc_glue.h 384 -TStringLen ELJApp_GetUserHome( void* _usr, TStringOutVoid _buf );=0D -TStringLen ELJApp_GetUserId( TStringOutVoid _buf );=0D -TStringLen ELJApp_GetUserName( TStringOutVoid _buf );=0D -TStringLen ELJApp_GetVendorName( TStringOutVoid _buf );=0D +TClass(wxString) ELJApp_GetUserHome( void* _usr );=0D +TClass(wxString) ELJApp_GetUserId( );=0D +TClass(wxString) ELJApp_GetUserName( );=0D +TClass(wxString) ELJApp_GetVendorName( );=0D /* int ELJApp_GetWantDebugOutput( ); */=0D void ELJApp_InitAllImageHandlers( );=0D int ELJApp_Initialized( );=0D hunk ./wxc/include/wxc_glue.h 397 int ELJApp_SafeYield( TClass(wxWindow) _win );=0D /* int ELJApp_SendIdleEvents( ); */=0D /* int ELJApp_SendIdleEventsToWindow( TClass(wxWindow) win ); */=0D -void ELJApp_SetAppName( TString name );=0D -void ELJApp_SetClassName( TString name );=0D +void ELJApp_SetAppName( TClass(wxString) name );=0D +void ELJApp_SetClassName( TClass(wxString) name );=0D void ELJApp_SetExitOnFrameDelete( int flag );=0D void ELJApp_SetPrintMode( int mode );=0D void ELJApp_SetTooltipDelay( int _ms );=0D hunk ./wxc/include/wxc_glue.h 404 void ELJApp_SetTopWindow( TClass(wxWindow) _wnd );=0D void ELJApp_SetUseBestVisual( int flag );=0D -void ELJApp_SetVendorName( TString name );=0D +void ELJApp_SetVendorName( TClass(wxString) name );=0D void ELJApp_Sleep( int _scs );=0D void ELJApp_MilliSleep( int _mscs );=0D int ELJApp_Yield( );=0D hunk ./wxc/include/wxc_glue.h 420 TClassDefExtend(ELJClient,wxClient)=0D TClass(ELJClient) ELJClient_Create( void* _eobj, void* _cnct );=0D void ELJClient_Delete( TSelf(ELJClient) _obj );=0D -void ELJClient_MakeConnection( TSelf(ELJClient) _obj, void* host, TC= lass(wxServer) server, void* topic );=0D +void ELJClient_MakeConnection( TSelf(ELJClient) _obj, TClass(wxStrin= g) host, TClass(wxServer) server, TClass(wxString) topic );=0D =0D /* ELJCommand */=0D TClassDefExtend(ELJCommand,wxCommand)=0D hunk ./wxc/include/wxc_glue.h 425 TBool ELJCommand_CanUndo( TSelf(ELJCommand) _obj );=0D -TClass(ELJCommand) ELJCommand_Create( int _und, void* _nme, void* _obj, vo= id* _clb );=0D +TClass(ELJCommand) ELJCommand_Create( int _und, TClass(wxString) _nme, voi= d* _obj, void* _clb );=0D void ELJCommand_Delete( TSelf(ELJCommand) _obj );=0D hunk ./wxc/include/wxc_glue.h 427 -TStringLen ELJCommand_GetName( TSelf(ELJCommand) _obj, TStringOutVoid _buf= );=0D +TClass(wxString) ELJCommand_GetName( TSelf(ELJCommand) _obj );=0D =0D /* ELJConnection */=0D TClassDefExtend(ELJConnection,wxConnection)=0D hunk ./wxc/include/wxc_glue.h 431 -int ELJConnection_Advise( TSelf(ELJConnection) _obj, void* item, vo= id* data, int size, int format );=0D +int ELJConnection_Advise( TSelf(ELJConnection) _obj, TClass(wxStrin= g) item, void* data, int size, int format );=0D void ELJConnection_Compress( TSelf(ELJConnection) _obj, int on );=0D TClass(ELJConnection) ELJConnection_Create( void* _obj, void* buffer, int = size );=0D TClass(ELJConnection) ELJConnection_CreateDefault( TSelf(ELJConnection) _o= bj );=0D hunk ./wxc/include/wxc_glue.h 436 void ELJConnection_Delete( TSelf(ELJConnection) _obj );=0D -int ELJConnection_Disconnect( TSelf(ELJConnection) _obj );=0D -int ELJConnection_Execute( TSelf(ELJConnection) _obj, void* data, i= nt size, int format );=0D -int ELJConnection_Poke( TSelf(ELJConnection) _obj, void* item, void= * data, int size, int format );=0D -void* ELJConnection_Request( TSelf(ELJConnection) _obj, void* item, T= Class(wxSize) size, int format );=0D +TBool ELJConnection_Disconnect( TSelf(ELJConnection) _obj );=0D +TBool ELJConnection_Execute( TSelf(ELJConnection) _obj, TClass(wxStri= ng) data, int size, int format );=0D +TBool ELJConnection_Poke( TSelf(ELJConnection) _obj, TClass(wxString)= item, void* data, int size, int format );=0D +void* ELJConnection_Request( TSelf(ELJConnection) _obj, TClass(wxStri= ng) item, TClass(wxSize) size, int format );=0D void ELJConnection_SetOnAdvise( TSelf(ELJConnection) _obj, void* _fn= c );=0D void ELJConnection_SetOnDisconnect( TSelf(ELJConnection) _obj, void*= _fnc );=0D void ELJConnection_SetOnExecute( TSelf(ELJConnection) _obj, void* _f= nc );=0D hunk ./wxc/include/wxc_glue.h 447 void ELJConnection_SetOnRequest( TSelf(ELJConnection) _obj, void* _f= nc );=0D void ELJConnection_SetOnStartAdvise( TSelf(ELJConnection) _obj, void= * _fnc );=0D void ELJConnection_SetOnStopAdvise( TSelf(ELJConnection) _obj, void*= _fnc );=0D -int ELJConnection_StartAdvise( TSelf(ELJConnection) _obj, void* ite= m );=0D -int ELJConnection_StopAdvise( TSelf(ELJConnection) _obj, void* item= );=0D +TBool ELJConnection_StartAdvise( TSelf(ELJConnection) _obj, TClass(wx= String) item );=0D +TBool ELJConnection_StopAdvise( TSelf(ELJConnection) _obj, TClass(wxS= tring) item );=0D =0D /* ELJDragDataObject */=0D TClassDef(ELJDragDataObject)=0D hunk ./wxc/include/wxc_glue.h 452 -TClass(ELJDragDataObject) ELJDragDataObject_Create( void* _obj, void* _fmt= , void* _func1, void* _func2, void* _func3 );=0D +TClass(ELJDragDataObject) ELJDragDataObject_Create( void* _obj, TClass(wxS= tring) _fmt, void* _func1, void* _func2, void* _func3 );=0D void ELJDragDataObject_Delete( TSelf(ELJDragDataObject) _obj );=0D =0D /* ELJDropTarget */=0D hunk ./wxc/include/wxc_glue.h 553 void ELJPrintout_GetPPIScreen( TSelf(ELJPrintout) _obj, TPointOutVoi= d(_x,_y) );=0D void ELJPrintout_GetPageSizeMM( TSelf(ELJPrintout) _obj, TSizeOutVoi= d(_w,_h) );=0D void ELJPrintout_GetPageSizePixels( TSelf(ELJPrintout) _obj, TSizeOu= tVoid(_w,_h) );=0D -TStringLen ELJPrintout_GetTitle( TSelf(ELJPrintout) _obj, TStringOutVoid _= buf );=0D +TClass(wxString) ELJPrintout_GetTitle( TSelf(ELJPrintout) _obj );=0D TBool ELJPrintout_IsPreview( TSelf(ELJPrintout) _obj );=0D void ELJPrintout_SetDC( TSelf(ELJPrintout) _obj, TClass(wxDC) dc );= =0D void ELJPrintout_SetIsPreview( TSelf(ELJPrintout) _obj, int p );=0D hunk ./wxc/include/wxc_glue.h 567 TClassDefExtend(ELJServer,wxServer)=0D TClass(ELJServer) ELJServer_Create( void* _eobj, void* _cnct );=0D void ELJServer_Delete( TSelf(ELJServer) _obj );=0D -int ELJServer_Initialize( TSelf(ELJServer) _obj, TStringVoid name )= ;=0D +int ELJServer_Initialize( TSelf(ELJServer) _obj, TClass(wxString) n= ame );=0D =0D /* ELJTextDropTarget */=0D TClassDefExtend(ELJTextDropTarget,wxTextDropTarget)=0D hunk ./wxc/include/wxc_glue.h 962 TClass(wxBitmap) wxBitmap_CreateDefault( );=0D TClass(wxBitmap) wxBitmap_CreateEmpty( TSize(_width,_height), int _depth )= ;=0D TClass(wxBitmap) wxBitmap_CreateFromXPM( TSelf(wxBitmap) data );=0D -TClass(wxBitmap) wxBitmap_CreateLoad( TStringVoid name, int type );=0D +TClass(wxBitmap) wxBitmap_CreateLoad( TClass(wxString) name, int type );= =0D void wxBitmap_Delete( TSelf(wxBitmap) _obj );=0D void* wxBitmap_FindHandlerByExtension( TSelf(wxBitmap) extension, int= type );=0D hunk ./wxc/include/wxc_glue.h 965 -void* wxBitmap_FindHandlerByName( TStringVoid name );=0D +void* wxBitmap_FindHandlerByName( TClass(wxString) name );=0D void* wxBitmap_FindHandlerByType( int type );=0D int wxBitmap_GetDepth( TSelf(wxBitmap) _obj );=0D int wxBitmap_GetHeight( TSelf(wxBitmap) _obj );=0D hunk ./wxc/include/wxc_glue.h 974 int wxBitmap_GetWidth( TSelf(wxBitmap) _obj );=0D void wxBitmap_InitStandardHandlers( );=0D void wxBitmap_InsertHandler( TClass(wxEvtHandler) handler );=0D -int wxBitmap_LoadFile( TSelf(wxBitmap) _obj, TStringVoid name, int = type );=0D -TBool wxBitmap_Ok( TSelf(wxBitmap) _obj );=0D -int wxBitmap_RemoveHandler( TStringVoid name );=0D -int wxBitmap_SaveFile( TSelf(wxBitmap) _obj, TStringVoid name, int = type, TClass(wxPalette) cmap );=0D +int wxBitmap_LoadFile( TSelf(wxBitmap) _obj, TClass(wxString) name,= int type );=0D +TBool wxBitmap_IsOk( TSelf(wxBitmap) _obj );=0D +TBool wxBitmap_RemoveHandler( TClass(wxString) name );=0D +int wxBitmap_SaveFile( TSelf(wxBitmap) _obj, TClass(wxString) name,= int type, TClass(wxPalette) cmap );=0D void wxBitmap_SetDepth( TSelf(wxBitmap) _obj, int d );=0D void wxBitmap_SetHeight( TSelf(wxBitmap) _obj, int h );=0D void wxBitmap_SetMask( TSelf(wxBitmap) _obj, TClass(wxMask) mask );= =0D hunk ./wxc/include/wxc_glue.h 1063 =0D /* wxBusyInfo */=0D TClassDef(wxBusyInfo)=0D -TClass(wxBusyInfo) wxBusyInfo_Create( TStringVoid _txt );=0D +TClass(wxBusyInfo) wxBusyInfo_Create( TClass(wxString) _txt );=0D void wxBusyInfo_Delete( TSelf(wxBusyInfo) _obj );=0D =0D /* wxButton */=0D hunk ./wxc/include/wxc_glue.h 1068 TClassDefExtend(wxButton,wxControl)=0D -TClass(wxButton) wxButton_Create( TClass(wxWindow) _prt, int _id, TString = _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D +TClass(wxButton) wxButton_Create( TClass(wxWindow) _prt, int _id, TClass(w= xString) _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D int wxButton_SetBackgroundColour( TSelf(wxButton) _obj, TClass(wxCo= lour) colour );=0D void wxButton_SetDefault( TSelf(wxButton) _obj );=0D =0D hunk ./wxc/include/wxc_glue.h 1151 =0D /* wxCheckBox */=0D TClassDefExtend(wxCheckBox,wxControl)=0D -TClass(wxCheckBox) wxCheckBox_Create( TClass(wxWindow) _prt, int _id, TStr= ing _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D +TClass(wxCheckBox) wxCheckBox_Create( TClass(wxWindow) _prt, int _id, TCla= ss(wxString) _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D TBoolInt wxCheckBox_GetValue( TSelf(wxCheckBox) _obj );=0D void wxCheckBox_SetValue( TSelf(wxCheckBox) _obj, TBoolInt value );= =0D =0D hunk ./wxc/include/wxc_glue.h 1163 =0D /* wxChoice */=0D TClassDefExtend(wxChoice,wxControl)=0D -void wxChoice_Append( TSelf(wxChoice) _obj, TString item );=0D +void wxChoice_Append( TSelf(wxChoice) _obj, TClass(wxString) item );= =0D void wxChoice_Clear( TSelf(wxChoice) _obj );=0D TClass(wxChoice) wxChoice_Create( TClass(wxWindow) _prt, int _id, TRect(_l= ft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );=0D void wxChoice_Delete( TSelf(wxChoice) _obj, int n );=0D hunk ./wxc/include/wxc_glue.h 1167 -int wxChoice_FindString( TSelf(wxChoice) _obj, TString s );=0D +int wxChoice_FindString( TSelf(wxChoice) _obj, TClass(wxString) s )= ;=0D int wxChoice_GetCount( TSelf(wxChoice) _obj );=0D int wxChoice_GetSelection( TSelf(wxChoice) _obj );=0D hunk ./wxc/include/wxc_glue.h 1170 -TStringLen wxChoice_GetString( TSelf(wxChoice) _obj, int n, TStringOutVoid= _buf );=0D +TClass(wxString) wxChoice_GetString( TSelf(wxChoice) _obj, int n );=0D void wxChoice_SetSelection( TSelf(wxChoice) _obj, int n );=0D hunk ./wxc/include/wxc_glue.h 1172 -void wxChoice_SetString( TSelf(wxChoice) _obj, int n, TString s );= =0D +void wxChoice_SetString( TSelf(wxChoice) _obj, int n, TClass(wxStrin= g) s );=0D =0D /* wxClassInfo */=0D TClassDef(wxClassInfo)=0D hunk ./wxc/include/wxc_glue.h 1178 void* wxClassInfo_CreateClassByName( TSelf(wxClassInfo) _inf );=0D void* wxClassInfo_GetClassName( TSelf(wxClassInfo) _inf );=0D -TBool wxClassInfo_IsKindOf( TSelf(wxClassInfo) _obj, TStringVoid _nam= e );=0D +TBool wxClassInfo_IsKindOf( TSelf(wxClassInfo) _obj, TClass(wxString)= _name );=0D =0D /* wxClient */=0D TClassDefExtend(wxClient,wxClientBase)=0D hunk ./wxc/include/wxc_glue.h 1264 =0D /* wxComboBox */=0D TClassDefExtend(wxComboBox,wxChoice)=0D -void wxComboBox_Append( TSelf(wxComboBox) _obj, TString item );=0D -void wxComboBox_AppendData( TSelf(wxComboBox) _obj, TString item, vo= id* d );=0D +void wxComboBox_Append( TSelf(wxComboBox) _obj, TClass(wxString) ite= m );=0D +void wxComboBox_AppendData( TSelf(wxComboBox) _obj, TClass(wxString)= item, void* d );=0D void wxComboBox_Clear( TSelf(wxComboBox) _obj );=0D void wxComboBox_Copy( TSelf(wxComboBox) _obj );=0D hunk ./wxc/include/wxc_glue.h 1268 -TClass(wxComboBox) wxComboBox_Create( TClass(wxWindow) _prt, int _id, TStr= ingVoid _txt, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );= =0D +TClass(wxComboBox) wxComboBox_Create( TClass(wxWindow) _prt, int _id, TCla= ss(wxString) _txt, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _st= l );=0D void wxComboBox_Cut( TSelf(wxComboBox) _obj );=0D void wxComboBox_Delete( TSelf(wxComboBox) _obj, int n );=0D hunk ./wxc/include/wxc_glue.h 1271 -int wxComboBox_FindString( TSelf(wxComboBox) _obj, TString s );=0D +int wxComboBox_FindString( TSelf(wxComboBox) _obj, TClass(wxString)= s );=0D TClass(wxClientData) wxComboBox_GetClientData( TSelf(wxComboBox) _obj, int= n );=0D int wxComboBox_GetCount( TSelf(wxComboBox) _obj );=0D int wxComboBox_GetInsertionPoint( TSelf(wxComboBox) _obj );=0D hunk ./wxc/include/wxc_glue.h 1277 int wxComboBox_GetLastPosition( TSelf(wxComboBox) _obj );=0D int wxComboBox_GetSelection( TSelf(wxComboBox) _obj );=0D -TStringLen wxComboBox_GetString( TSelf(wxComboBox) _obj, int n, TStringOut= Void _buf );=0D -TStringLen wxComboBox_GetStringSelection( TSelf(wxComboBox) _obj, TStringO= utVoid _buf );=0D -TStringLen wxComboBox_GetValue( TSelf(wxComboBox) _obj, TStringOutVoid _bu= f );=0D +TClass(wxString) wxComboBox_GetString( TSelf(wxComboBox) _obj, int n );=0D +TClass(wxString) wxComboBox_GetStringSelection( TSelf(wxComboBox) _obj );= =0D +TClass(wxString) wxComboBox_GetValue( TSelf(wxComboBox) _obj );=0D void wxComboBox_Paste( TSelf(wxComboBox) _obj );=0D void wxComboBox_Remove( TSelf(wxComboBox) _obj, int from, int to );= =0D hunk ./wxc/include/wxc_glue.h 1282 -void wxComboBox_Replace( TSelf(wxComboBox) _obj, int from, int to, T= String value );=0D +void wxComboBox_Replace( TSelf(wxComboBox) _obj, int from, int to, T= Class(wxString) value );=0D void wxComboBox_SetClientData( TSelf(wxComboBox) _obj, int n, TClass= (wxClientData) clientData );=0D void wxComboBox_SetEditable( TSelf(wxComboBox) _obj, TBool editable = );=0D void wxComboBox_SetInsertionPoint( TSelf(wxComboBox) _obj, int pos )= ;=0D hunk ./wxc/include/wxc_glue.h 1303 long wxCommandEvent_GetExtraLong( TSelf(wxCommandEvent) _obj );=0D long wxCommandEvent_GetInt( TSelf(wxCommandEvent) _obj );=0D int wxCommandEvent_GetSelection( TSelf(wxCommandEvent) _obj );=0D -TStringLen wxCommandEvent_GetString( TSelf(wxCommandEvent) _obj, TStringOu= tVoid _buf );=0D +TClass(wxString) wxCommandEvent_GetString( TSelf(wxCommandEvent) _obj );= =0D TBool wxCommandEvent_IsChecked( TSelf(wxCommandEvent) _obj );=0D TBool wxCommandEvent_IsSelection( TSelf(wxCommandEvent) _obj );=0D void wxCommandEvent_SetClientData( TSelf(wxCommandEvent) _obj, TClas= s(wxClientData) clientData );=0D hunk ./wxc/include/wxc_glue.h 1310 void wxCommandEvent_SetClientObject( TSelf(wxCommandEvent) _obj, TCl= ass(wxClientData) clientObject );=0D void wxCommandEvent_SetExtraLong( TSelf(wxCommandEvent) _obj, long e= xtraLong );=0D void wxCommandEvent_SetInt( TSelf(wxCommandEvent) _obj, int i );=0D -void wxCommandEvent_SetString( TSelf(wxCommandEvent) _obj, TString s= );=0D +void wxCommandEvent_SetString( TSelf(wxCommandEvent) _obj, TClass(wx= String) s );=0D =0D /* wxCommandLineParser */=0D TClassDef(wxCommandLineParser)=0D hunk ./wxc/include/wxc_glue.h 1346 TClass(wxConfigBase) wxConfigBase_Create( );=0D void wxConfigBase_Delete( TSelf(wxConfigBase) _obj );=0D TBool wxConfigBase_DeleteAll( TSelf(wxConfigBase) _obj );=0D -TBool wxConfigBase_DeleteEntry( TSelf(wxConfigBase) _obj, TStringVoid= key, TBoolInt bDeleteGroupIfEmpty );=0D -TBool wxConfigBase_DeleteGroup( TSelf(wxConfigBase) _obj, TStringVoid= key );=0D -TBool wxConfigBase_Exists( TSelf(wxConfigBase) _obj, TStringVoid strN= ame );=0D -TStringLen wxConfigBase_ExpandEnvVars( TSelf(wxConfigBase) _obj, TStringVo= id str, TStringOutVoid _buf );=0D +TBool wxConfigBase_DeleteEntry( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) key, TBool bDeleteGroupIfEmpty );=0D +TBool wxConfigBase_DeleteGroup( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) key );=0D +TBool wxConfigBase_Exists( TSelf(wxConfigBase) _obj, TClass(wxString)= strName );=0D +TClass(wxString) wxConfigBase_ExpandEnvVars( TSelf(wxConfigBase) _obj, TCl= ass(wxString) str );=0D TBool wxConfigBase_Flush( TSelf(wxConfigBase) _obj, TBool bCurrentOnl= y );=0D hunk ./wxc/include/wxc_glue.h 1351 -TStringLen wxConfigBase_GetAppName( TSelf(wxConfigBase) _obj, TStringOutVo= id _buf );=0D -int wxConfigBase_GetEntryType( TSelf(wxConfigBase) _obj, TStringVoi= d name );=0D +TClass(wxString) wxConfigBase_GetAppName( TSelf(wxConfigBase) _obj );=0D +int wxConfigBase_GetEntryType( TSelf(wxConfigBase) _obj, TClass(wxS= tring) name );=0D TClass(wxString) wxConfigBase_GetFirstEntry( TSelf(wxConfigBase) _obj, voi= d* lIndex );=0D TClass(wxString) wxConfigBase_GetFirstGroup( TSelf(wxConfigBase) _obj, voi= d* lIndex );=0D TClass(wxString) wxConfigBase_GetNextEntry( TSelf(wxConfigBase) _obj, void= * lIndex);=0D hunk ./wxc/include/wxc_glue.h 1357 TClass(wxString) wxConfigBase_GetNextGroup( TSelf(wxConfigBase) _obj, void= * lIndex);=0D -int wxConfigBase_GetNumberOfEntries( TSelf(wxConfigBase) _obj, TBoo= lInt bRecursive );=0D -int wxConfigBase_GetNumberOfGroups( TSelf(wxConfigBase) _obj, TBool= Int bRecursive );=0D -TStringLen wxConfigBase_GetPath( TSelf(wxConfigBase) _obj, TStringOutVoid = _buf );=0D +int wxConfigBase_GetNumberOfEntries( TSelf(wxConfigBase) _obj, TBoo= l bRecursive );=0D +int wxConfigBase_GetNumberOfGroups( TSelf(wxConfigBase) _obj, TBool= bRecursive );=0D +TClass(wxString) wxConfigBase_GetPath( TSelf(wxConfigBase) _obj );=0D int wxConfigBase_GetStyle( TSelf(wxConfigBase) _obj );=0D hunk ./wxc/include/wxc_glue.h 1361 -TStringLen wxConfigBase_GetVendorName( TSelf(wxConfigBase) _obj, TStringOu= tVoid _buf );=0D -TBool wxConfigBase_HasEntry( TSelf(wxConfigBase) _obj, TStringVoid st= rName );=0D -TBool wxConfigBase_HasGroup( TSelf(wxConfigBase) _obj, TStringVoid st= rName );=0D +TClass(wxString) wxConfigBase_GetVendorName( TSelf(wxConfigBase) _obj );= =0D +TBool wxConfigBase_HasEntry( TSelf(wxConfigBase) _obj, TClass(wxStrin= g) strName );=0D +TBool wxConfigBase_HasGroup( TSelf(wxConfigBase) _obj, TClass(wxStrin= g) strName );=0D TBool wxConfigBase_IsExpandingEnvVars( TSelf(wxConfigBase) _obj );=0D TBool wxConfigBase_IsRecordingDefaults( TSelf(wxConfigBase) _obj );= =0D hunk ./wxc/include/wxc_glue.h 1366 -TBoolInt wxConfigBase_ReadBool( TSelf(wxConfigBase) _obj, TStringVoid ke= y, TBoolInt defVal );=0D -double wxConfigBase_ReadDouble( TSelf(wxConfigBase) _obj, TStringVoid = key, double defVal );=0D -int wxConfigBase_ReadInteger( TSelf(wxConfigBase) _obj, TStringVoid= key, int defVal );=0D -TClass(wxString) wxConfigBase_ReadString( TSelf(wxConfigBase) _obj, TStrin= gVoid key, TStringVoid defVal );=0D -TBoolInt wxConfigBase_RenameEntry( TSelf(wxConfigBase) _obj, TStringVoid= oldName, TStringVoid newName );=0D -TBoolInt wxConfigBase_RenameGroup( TSelf(wxConfigBase) _obj, TStringVoid= oldName, TStringVoid newName );=0D -void wxConfigBase_SetAppName( TSelf(wxConfigBase) _obj, TStringVoid = appName );=0D -void wxConfigBase_SetExpandEnvVars( TSelf(wxConfigBase) _obj, TBoolI= nt bDoIt );=0D -void wxConfigBase_SetPath( TSelf(wxConfigBase) _obj, TStringVoid str= Path );=0D -void wxConfigBase_SetRecordDefaults( TSelf(wxConfigBase) _obj, TBool= Int bDoIt );=0D +TBool wxConfigBase_ReadBool( TSelf(wxConfigBase) _obj, TClass(wxStrin= g) key, TBool defVal );=0D +double wxConfigBase_ReadDouble( TSelf(wxConfigBase) _obj, TClass(wxStr= ing) key, double defVal );=0D +int wxConfigBase_ReadInteger( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) key, int defVal );=0D +TClass(wxString) wxConfigBase_ReadString( TSelf(wxConfigBase) _obj, TClass= (wxString) key, TClass(wxString) defVal );=0D +TBool wxConfigBase_RenameEntry( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) oldName, TClass(wxString) newName );=0D +TBool wxConfigBase_RenameGroup( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) oldName, TClass(wxString) newName );=0D +void wxConfigBase_SetAppName( TSelf(wxConfigBase) _obj, TClass(wxStr= ing) appName );=0D +void wxConfigBase_SetExpandEnvVars( TSelf(wxConfigBase) _obj, TBool = bDoIt );=0D +void wxConfigBase_SetPath( TSelf(wxConfigBase) _obj, TClass(wxString= ) strPath );=0D +void wxConfigBase_SetRecordDefaults( TSelf(wxConfigBase) _obj, TBool= bDoIt );=0D void wxConfigBase_SetStyle( TSelf(wxConfigBase) _obj, int style );= =0D hunk ./wxc/include/wxc_glue.h 1377 -void wxConfigBase_SetVendorName( TSelf(wxConfigBase) _obj, TStringVo= id vendorName );=0D -TBoolInt wxConfigBase_WriteBool( TSelf(wxConfigBase) _obj, TStringVoid k= ey, TBoolInt value );=0D -TBoolInt wxConfigBase_WriteDouble( TSelf(wxConfigBase) _obj, TStringVoid= key, double value );=0D -TBoolInt wxConfigBase_WriteInteger( TSelf(wxConfigBase) _obj, TStringVoi= d key, int value );=0D -TBoolInt wxConfigBase_WriteString( TSelf(wxConfigBase) _obj, TStringVoid= key, TStringVoid value );=0D +void wxConfigBase_SetVendorName( TSelf(wxConfigBase) _obj, TClass(wx= String) vendorName );=0D +TBool wxConfigBase_WriteBool( TSelf(wxConfigBase) _obj, TClass(wxStri= ng) key, TBool value );=0D +TBool wxConfigBase_WriteDouble( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) key, double value );=0D +TBool wxConfigBase_WriteInteger( TSelf(wxConfigBase) _obj, TClass(wxS= tring) key, int value );=0D +TBool wxConfigBase_WriteLong( TSelf(wxConfigBase) _obj, TClass(wxStri= ng) key, long value );=0D +TBool wxConfigBase_WriteString( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) key, TClass(wxString) value );=0D =0D /* wxConnection */=0D TClassDefExtend(wxConnection,wxConnectionBase)=0D hunk ./wxc/include/wxc_glue.h 1404 /* wxControl */=0D TClassDefExtend(wxControl,wxWindow)=0D void wxControl_Command( TSelf(wxControl) _obj, TClass(wxEvent) event= );=0D -TStringLen wxControl_GetLabel( TSelf(wxControl) _obj, TStringOutVoid _buf = );=0D -void wxControl_SetLabel( TSelf(wxControl) _obj, TString text );=0D +TClass(wxString) wxControl_GetLabel( TSelf(wxControl) _obj );=0D +void wxControl_SetLabel( TSelf(wxControl) _obj, TClass(wxString) tex= t );=0D =0D /* wxCountingOutputStream */=0D TClassDefExtend(wxCountingOutputStream,wxOutputStream)=0D hunk ./wxc/include/wxc_glue.h 1424 TClassDefExtend(wxCursor,wxBitmap)=0D TClass(wxCursor) Cursor_CreateFromStock( int _id );=0D TClass(wxCursor) Cursor_CreateFromImage( TClass(wxImage) image );=0D -TClass(wxCursor) Cursor_CreateLoad( TStringVoid name, long type, TSize(wi= dth,height) );=0D +TClass(wxCursor) Cursor_CreateLoad( TClass(wxString) name, long type, TSi= ze(width,height) );=0D =0D /* wxCustomDataObject */=0D TClassDefExtend(wxCustomDataObject,wxDataObjectSimple)=0D hunk ./wxc/include/wxc_glue.h 1452 void wxDC_DrawEllipse( TSelf(wxDC) _obj, TRect(x,y,width,height) );= =0D 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, TString str, TRect(x,y,w,h), = int align, int indexAccel);=0D -void wxDC_DrawLabelBitmap( TSelf(wxDC) _obj, TString str, TClass(wxB= itmap) bmp, TRect(x,y,w,h), int align, int indexAccel, int *_x, int *_y, in= t *_w, int *_h );=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 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 1460 void wxDC_DrawPolygon( TSelf(wxDC) _obj, int n, void* x, void* y, TP= oint(xoffset,yoffset), int fillStyle );=0D void wxDC_DrawPolyPolygon( TSelf(wxDC) _obj, int n, void *count, voi= d *x, void *y, TPoint(xoffset,yoffset), int fillStyle);=0D void wxDC_DrawRectangle( TSelf(wxDC) _obj, TRect(x,y,width,height) )= ;=0D -void wxDC_DrawRotatedText( TSelf(wxDC) _obj, TStringVoid text, TPoin= t(x,y), double angle );=0D +void wxDC_DrawRotatedText( TSelf(wxDC) _obj, TClass(wxString) text, = TPoint(x,y), double angle );=0D void wxDC_DrawRoundedRectangle( TSelf(wxDC) _obj, TRect(x,y,width,he= ight), double radius );=0D hunk ./wxc/include/wxc_glue.h 1462 -void wxDC_DrawText( TSelf(wxDC) _obj, TStringVoid text, TPoint(x,y) = );=0D +void wxDC_DrawText( TSelf(wxDC) _obj, TClass(wxString) text, TPoint(= x,y) );=0D void wxDC_EndDoc( TSelf(wxDC) _obj );=0D void wxDC_EndDrawing( TSelf(wxDC) _obj );=0D void wxDC_EndPage( TSelf(wxDC) _obj );=0D hunk ./wxc/include/wxc_glue.h 1486 void wxDC_GetSize( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );=0D void wxDC_GetSizeMM( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );=0D void wxDC_GetTextBackground( TSelf(wxDC) _obj, TClassRef(wxColour) _= ref );=0D -void wxDC_GetTextExtent( TSelf(wxDC) self, TStringVoid string, void*= w, void* h, void* descent, void* externalLeading, TClass(wxFont) theFont )= ;=0D -void wxDC_GetMultiLineTextExtent( TSelf(wxDC) self, TStringVoid stri= ng, void* w, void* h, void* heightLine, TClass(wxFont) theFont );=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 void wxDC_GetTextForeground( TSelf(wxDC) _obj, TClassR... [truncated message content] |
