Menu
▾
▴
[wxhaskell-users] darcs patch: Initial wxWidgets 2.8.x's API Support
|
From: shelarcy <she...@gm...> - 2007-12-12 14:27:48
|
DarcsURL: http://darcs.haskell.org/wxhaskell=0A= MIME-Version: 1.0=0A= Content-Type: multipart/mixed; boundary=3D"=3D_"=0A= =0A= --=3D_=0A= Content-Type: text/plain=0A= Content-Transfer-Encoding: quoted-printable=0A= =0A= Wed Dec 12 22:02:24 =3D93=3D8C=3D8B=3D9E (=3D95W=3D8F=3D80=3D8E=3D9E) = 2007 shelarcy <shelarc=3D=0A= y...@gm...>=0A= * Initial wxWidgets 2.8.x's API Support=0A= =0A= --=3D_=0A= Content-Type: text/x-darcs-patch; = name=3D"initial-wxwidgets-2_8_x_s-api-support.dpatch"=0A= Content-Transfer-Encoding: quoted-printable=0A= Content-Description: A darcs patch for your repository!=0A= =0A= =0A= New patches:=0A= =0A= [Initial wxWidgets 2.8.x's API Support=0A= shelarcy <she...@gm...>**20071212130224] {=0A= move ./wxc/include/wave.h ./wxc/include/sound.h=0A= move ./wxc/src/wave.cpp ./wxc/src/sound.cpp=0A= hunk ./makefile 149=0A= - treectrl image apppath db dragimage glcanvas wave managed \=0A= + treectrl image apppath db dragimage glcanvas sound managed \=0A= hunk ./makefile 181=0A= - wxc/include/wave.h wxc/include/managed.h \=0A= + wxc/include/sound.h wxc/include/managed.h \=0A= hunk ./wx/src/Graphics/UI/WX/Media.hs 20=0A= - , Sound, sound, playLoop, playWait=0A= + , Wave, sound, playLoop, playWait=0A= hunk ./wx/src/Graphics/UI/WX/Media.hs 89=0A= -sound :: FilePath -> Wave ()=0A= +sound :: FilePath -> Sound ()=0A= hunk ./wx/src/Graphics/UI/WX/Media.hs 91=0A= - =3D3D unsafePerformIO $ waveCreate fname False=0A= + =3D3D unsafePerformIO $ soundCreate fname False=0A= hunk ./wx/src/Graphics/UI/WX/Media.hs 93=0A= --- | Define Sound type synonym for people who are familiar with=0A= --- wxWidgets 2.6.x or higher name.=0A= -type Sound a =3D3D Wave a=0A= +{-# DEPRECATED Wave "Use Sound instead" #-}=0A= +-- | Define Wave type synonym for people who are familiar with=0A= +-- wxWidgets 2.4.x or lower name.=0A= +type Wave a =3D3D Sound a=0A= hunk ./wx/src/Graphics/UI/WX/Media.hs 99=0A= - play sound =3D3D unitIO (wavePlay sound True False)=0A= + play sound =3D3D=0A= + if (div wxVersion 100) =3D3D=3D3D 24=0A= + then unitIO (soundPlayCompatible sound True False)=0A= + else unitIO (soundPlay sound wxSOUND_ASYNC)=0A= hunk ./wx/src/Graphics/UI/WX/Media.hs 106=0A= -playLoop :: Wave a -> IO ()=0A= -playLoop wave=0A= - =3D3D unitIO (wavePlay wave True True)=0A= +playLoop :: Sound a -> IO ()=0A= +playLoop sound=0A= + =3D3D if (div wxVersion 100) =3D3D=3D3D 24=0A= + then unitIO (soundPlayCompatible sound True True)=0A= + else unitIO (soundPlay sound $ wxSOUND_ASYNC .+. wxSOUND_LOOP)=0A= hunk ./wx/src/Graphics/UI/WX/Media.hs 113=0A= -playWait :: Wave a -> IO ()=0A= -playWait wave=0A= - =3D3D unitIO (wavePlay wave False False)=0A= +playWait :: Sound a -> IO ()=0A= +playWait sound=0A= + =3D3D if (div wxVersion 100) =3D3D=3D3D 24=0A= + then unitIO (soundPlayCompatible sound False False)=0A= + else unitIO (soundPlay sound wxSOUND_SYNC)=0A= hunk ./wx/src/Graphics/UI/WX/Menu.hs 87=0A= - if (vis && wxToolkit =3D3D=3D3D WxMac && (div wxVersion 100) = =3D3D=3D3D=3D=0A= 25)=0A= + if (vis && wxToolkit =3D3D=3D3D WxMac && (div wxVersion 100) = >=3D3D 2=3D=0A= 5)=0A= hunk ./wxSTC-D3/stc.h 1386=0A= + /* SetCaretLineBack is changed to SetCaretLineBackground.=0A= hunk ./wxSTC-D3/stc.h 1389=0A= + */=0A= hunk ./wxc/eiffel/wxc_defs.e 176=0A= +wxSOUND_SYNC: INTEGER is 0=3D0D=0A= +wxSOUND_ASYNC: INTEGER is 1=3D0D=0A= +wxSOUND_LOOP: INTEGER is 2=3D0D=0A= hunk ./wxc/include/dragimage.h 11=0A= -TClass(wxGenericDragImage) wxGenericDragImage_Create( TClass(wxCursor) = cu=3D=0A= rsor, int x, int y );=3D0D=0A= -TClass(wxGenericDragImage) wxGenericDragIcon( TClass(wxIcon) icon, int = x,=3D=0A= int y );=3D0D=0A= -TClass(wxGenericDragImage) wxGenericDragString( TClass(wxString) test, = in=3D=0A= t x, int y );=3D0D=0A= +TClass(wxGenericDragImage) wxGenericDragImage_Create( TClass(wxCursor) = cu=3D=0A= rsor );=3D0D=0A= +TClass(wxGenericDragImage) wxGenericDragIcon( TClass(wxIcon) icon = );=3D0D=0A= +TClass(wxGenericDragImage) wxGenericDragString( TClass(wxString) test = );=3D=0A= =3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 52=0A= -int expEVT_COMMAND_LIST_GET_INFO( );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 60=0A= -int expEVT_COMMAND_LIST_SET_INFO( );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 199=0A= +int expEVT_POWER_SUSPENDING( );=3D0D=0A= +int expEVT_POWER_SUSPENDED( );=3D0D=0A= +int expEVT_POWER_SUSPEND_CANCEL( );=3D0D=0A= +int expEVT_POWER_RESUME( );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 264=0A= -void* ELJApp_CreateLogTarget( );=3D0D=0A= +TClass(ELJLog) ELJApp_CreateLogTarget( );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1356=0A= -int wxDC_GetOptimization( TSelf(wxDC) _obj );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1387=0A= -void wxDC_SetOptimization( TSelf(wxDC) _obj, int opt );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1477=0A= -void wxDateTime_GetWeek( TSelf(wxDateTime) _obj, int numWeek, int = we=3D=0A= ekday, TClassRef(wxDateTime) _ref );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1522=0A= -int wxDateTime_SetToTheWeek( TSelf(wxDateTime) _obj, int = numWeek, i=3D=0A= nt weekday );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1826=0A= -int wxFileHistory_GetNoHistoryFiles( TSelf(wxFileHistory) _obj = );=3D=0A= =3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 2833=0A= -int wxListCtrl_GetItemSpacing( TSelf(wxListCtrl) _obj, TBool = isSmal=3D=0A= l );=3D0D=0A= +void wxListCtrl_GetItemSpacing( TSelf(wxListCtrl) _obj, TBool = isSmal=3D=0A= l, TSizeOutVoid(w,h) );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 3578=0A= +/* wxPostScriptPrintNativeData */=3D0D=0A= +TClassDefExtend(wxPostScriptPrintNativeData,wxObject)=3D0D=0A= +TClass(wxPostScriptPrintNativeData) wxPostScriptPrintNativeData_Create( = )=3D=0A= ;=3D0D=0A= +void wxPostScriptPrintNativeData_Delete( = TSelf(wxPostScriptPrintNati=3D=0A= veData) _obj );=3D0D=0A= +=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 3614=0A= -TBoolInt wxPrintDialogData_GetSetupDialog( TSelf(wxPrintDialogData) = _obj=3D=0A= );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 3624=0A= -void wxPrintDialogData_SetSetupDialog( TSelf(wxPrintDialogData) = _obj=3D=0A= , TBoolInt flag );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 4316=0A= -int wxTextValidator_GetExcludeList( TSelf(wxTextValidator) _obj, = vo=3D=0A= id* _ref );=3D0D=0A= -int wxTextValidator_GetIncludeList( TSelf(wxTextValidator) _obj, = vo=3D=0A= id* _ref );=3D0D=0A= +TArrayLen wxTextValidator_GetExcludeList( TSelf(wxTextValidator) _obj, = TA=3D=0A= rrayStringOutVoid _ref );=3D0D=0A= +TArrayLen wxTextValidator_GetIncludeList( TSelf(wxTextValidator) _obj, = TA=3D=0A= rrayStringOutVoid _ref );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 4568=0A= -/* wxWave */=3D0D=0A= -TClassDefExtend(wxWave,wxEvtHandler)=3D0D=0A= +/* wxSound */=3D0D=0A= +TClassDefExtend(wxSound,wxEvtHandler)=3D0D=0A= hunk ./wxc/include/ewxw_def.h 4=0A= +#ifdef EXPORT=0A= +#undef EXPORT=0A= +#endif=0A= hunk ./wxc/include/managed.h 5=0A= +=3D0D=0A= +#if defined (__WXMAC__) && defined (EXPORT)=3D0D=0A= +#undef EXPORT=3D0D=0A= +#define EXPORT extern "C"=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/include/sound.h 2=0A= - Wave=3D0D=0A= + Sound=3D0D=0A= hunk ./wxc/include/sound.h 4=0A= -TClassDefExtend(wxWave,wxObject);=3D0D=0A= +TClassDefExtend(wxSound,wxObject);=3D0D=0A= hunk ./wxc/include/sound.h 6=0A= -/** Usage: @waveCreate fileName isResource@. As yet (Nov 2003) = unsupported=3D=0A= on MacOS X */=3D0D=0A= -TClass(wxWave) wxWave_Create( TClass(wxString) fileName, TBool = isResource=3D=0A= );=3D0D=0A= -void wxWave_Delete(TSelf(wxWave) self);=3D0D=0A= -TBool wxWave_IsOk(TSelf(wxWave) self);=3D0D=0A= -TBool wxWave_Play(TSelf(wxWave) self, TBool async, TBool looped );=3D0D=0A= +/** Usage: @soundCreate fileName isResource@. As yet (Nov 2003) = unsupporte=3D=0A= d on MacOS X */=3D0D=0A= +TClass(wxSound) wxSound_Create( TClass(wxString) fileName, TBool = isResour=3D=0A= ce );=3D0D=0A= +void wxSound_Delete(TSelf(wxSound) self);=3D0D=0A= +TBool wxSound_IsOk(TSelf(wxSound) self);=3D0D=0A= +TBool wxSound_Play(TSelf(wxSound) self, int flag );=3D0D=0A= +TBool wxSound_PlayCompatible(TSelf(wxSound) self, TBool async, TBool = loop=3D=0A= ed );=3D0D=0A= hunk ./wxc/include/stc.h 13=0A= -TClass(wxColour) wxStyledTextCtrl_GetCaretLineBack( = TSelf(wxStyledTextCtrl=3D=0A= ) _obj );=0A= +TClass(wxColour) wxStyledTextCtrl_GetCaretLineBackground( = TSelf(wxStyledTe=3D=0A= xtCtrl) _obj );=0A= +/* SetCaretLineBack is changed name to SetCaretLineBackground.=0A= + So I avoid to use stc_gen.h for backward compatibility. */=0A= +void wxStyledTextCtrl_SetCaretLineBackground(TSelf(wxStyledTextCtrl) = _obj,=3D=0A= TColorRGB(back_r,back_g,back_b));=0A= hunk ./wxc/include/wrapper.h 6=0A= +/* MSC: disable warning about using different code page (just affects = perf=3D=0A= ormance) */=0A= +#pragma warning(disable: 4819)=0A= hunk ./wxc/include/wrapper.h 16=0A= +#include "wx/apptrait.h"=0A= hunk ./wxc/include/wxc.h 25=0A= -#include "wave.h"=0A= +#include "sound.h"=0A= hunk ./wxc/src/dragimage.cpp 34=0A= -EWXWEXPORT(wxGenericDragImage*,wxGenericDragImage_Create)( const = wxCursor*=3D=0A= cursor, int x, int y )=0A= +EWXWEXPORT(wxGenericDragImage*,wxGenericDragImage_Create)( const = wxCursor*=3D=0A= cursor )=0A= hunk ./wxc/src/dragimage.cpp 36=0A= - return new wxGenericDragImage(*cursor, wxPoint(x, y));=0A= + return new wxGenericDragImage(*cursor);=0A= hunk ./wxc/src/dragimage.cpp 39=0A= -EWXWEXPORT(wxGenericDragImage*,wxGenericDragIcon)( const wxIcon* icon, = int=3D=0A= x, int y )=0A= +EWXWEXPORT(wxGenericDragImage*,wxGenericDragIcon)( const wxIcon* icon )=0A= hunk ./wxc/src/dragimage.cpp 41=0A= - return new wxGenericDragImage(*icon, wxNullCursor, wxPoint(x, y));=0A= + return new wxGenericDragImage(*icon, wxNullCursor);=0A= hunk ./wxc/src/dragimage.cpp 44=0A= -EWXWEXPORT(wxGenericDragImage*,wxGenericDragString)( const wxString* = text,=3D=0A= int x, int y )=0A= +EWXWEXPORT(wxGenericDragImage*,wxGenericDragString)( const wxString* = text =3D=0A= )=0A= hunk ./wxc/src/dragimage.cpp 46=0A= - return new wxGenericDragImage(*text, wxNullCursor, wxPoint(x, y));=0A= + return new wxGenericDragImage(*text, wxNullCursor);=0A= hunk ./wxc/src/eljevent.cpp 6=0A= +#if (wxVERSION_NUMBER >=3D3D 2800)=0A= +#include "wx/power.h"=0A= +#endif=0A= +=0A= +#if defined(wxUSE_TAB_DIALOG) && (wxUSE_TAB_DIALOG=3D3D=3D3D0)=0A= +# undef wxUSE_TAB_DIALOG=0A= +#endif=0A= +=0A= hunk ./wxc/src/eljevent.cpp 111=0A= - return ((wxCommandEvent*)_obj)->m_clientData;=0A= + return ((wxCommandEvent*)_obj)->GetClientData();=0A= hunk ./wxc/src/eljevent.cpp 157=0A= - return ((wxCommandEvent*)_obj)->m_extraLong;=0A= + return ((wxCommandEvent*)_obj)->GetExtraLong();=0A= hunk ./wxc/src/eljevent.cpp 1379=0A= - return (int)wxEVT_POWER;=0A= +#if (wxVERSION_NUMBER <=3D3D 2800)=0A= + return (int)wxEVT_POWER;=0A= +#else=0A= + return 1;=0A= +#endif=0A= +}=0A= +=0A= +EWXWEXPORT(int,expEVT_POWER_SUSPENDING)()=0A= +{=0A= +#ifdef wxHAS_POWER_EVENTS=0A= + return (int)wxEVT_POWER_SUSPENDING;=0A= +#else=0A= + return 0;=0A= +#endif=0A= +}=0A= +=0A= +EWXWEXPORT(int,expEVT_POWER_SUSPENDED)()=0A= +{=0A= +#ifdef wxHAS_POWER_EVENTS=0A= + return (int)wxEVT_POWER_SUSPENDED;=0A= +#else=0A= + return 0;=0A= +#endif=0A= +}=0A= +=0A= +EWXWEXPORT(int,expEVT_POWER_SUSPEND_CANCEL)()=0A= +{=0A= +#ifdef wxHAS_POWER_EVENTS=0A= + return (int)wxEVT_POWER_SUSPEND_CANCEL;=0A= +#else=0A= + return 0;=0A= +#endif=0A= +}=0A= +=0A= +EWXWEXPORT(int,expEVT_POWER_RESUME)()=0A= +{=0A= +#ifdef wxHAS_POWER_EVENTS=0A= + return (int)wxEVT_POWER_RESUME;=0A= +#else=0A= + return 0;=0A= +#endif=0A= hunk ./wxc/src/eljevent.cpp 1755=0A= -EWXWEXPORT(int,expEVT_COMMAND_LIST_GET_INFO)()=0A= -{=0A= - return (int)wxEVT_COMMAND_LIST_GET_INFO;=0A= -}=0A= -=0A= -EWXWEXPORT(int,expEVT_COMMAND_LIST_SET_INFO)()=0A= -{=0A= - return (int)wxEVT_COMMAND_LIST_SET_INFO;=0A= -}=0A= -=0A= hunk ./wxc/src/eljevent.cpp 1802=0A= -#if defined(__WXGTK__) || defined(__WXMAC__)=0A= +#if ((wxVERSION_NUMBER > 2800) && !defined(wxUSE_TAB_DIALOG)) || = defined(_=3D=0A= _WXGTK__) || defined(__WXMAC__)=0A= hunk ./wxc/src/eljevent.cpp 1811=0A= -#if defined(__WXGTK__) || defined(__WXMAC__)=0A= +#if ((wxVERSION_NUMBER > 2800) && !defined(wxUSE_TAB_DIALOG)) || = defined(_=3D=0A= _WXGTK__) || defined(__WXMAC__)=0A= hunk ./wxc/src/ewxw/eljcolour.cpp 102=0A= -EWXWEXPORT(int, wxColour_ValidName)(void* _name)=3D0D=0A= +EWXWEXPORT(int, wxColour_ValidName)(wxChar* _name)=3D0D=0A= hunk ./wxc/src/ewxw/eljcolour.cpp 104=0A= - return (wxTheColourDatabase->FindColour ((wxChar*)_name)) !=3D3D = NULL;=3D0D=0A= +#if (wxVERSION_NUMBER < 2600)=3D0D=0A= + return (wxTheColourDatabase->FindColour (wxString(_name))) !=3D3D = NULL;=3D0D=0A= +#else=3D0D=0A= + wxColour col =3D3D (wxTheColourDatabase->Find (wxString(_name)));=3D0D=0A= +#if (wxVERSION_NUMBER < 2800)=3D0D=0A= + return col.Ok();=3D0D=0A= +#else=3D0D=0A= + return col.IsOk();=3D0D=0A= +#endif=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljdatetime.cpp 223=0A= - =3D0D=0A= -EWXWEXPORT(int, wxDateTime_SetToTheWeek)(void* _obj, int numWeek, int = week=3D=0A= day)=3D0D=0A= -{=3D0D=0A= - return = (int)((wxDateTime*)_obj)->SetToTheWeek((wxDateTime::wxDateTime_t)n=3D=0A= umWeek, (wxDateTime::WeekDay)weekday);=3D0D=0A= -}=3D0D=0A= - =3D0D=0A= -EWXWEXPORT(void, wxDateTime_GetWeek)(void* _obj, int numWeek, int = weekday,=3D=0A= void* _ref)=3D0D=0A= -{=3D0D=0A= - *((wxDateTime*)_ref) =3D3D = ((wxDateTime*)_obj)->GetWeek((wxDateTime::wxDate=3D=0A= Time_t)numWeek, (wxDateTime::WeekDay)weekday);=3D0D=0A= -}=3D0D=0A= hunk ./wxc/src/ewxw/eljdc.cpp 407=0A= - =3D0D=0A= -EWXWEXPORT(void, wxDC_SetOptimization)(void* _obj, int opt)=3D0D=0A= -{=3D0D=0A= - ((wxDC*)_obj)->SetOptimization(opt !=3D3D 0);=3D0D=0A= -}=3D0D=0A= - =3D0D=0A= -EWXWEXPORT(int, wxDC_GetOptimization)(void* _obj)=3D0D=0A= -{=3D0D=0A= - return (int)((wxDC*)_obj)->GetOptimization();=3D0D=0A= -}=3D0D=0A= hunk ./wxc/src/ewxw/eljfilehist.cpp 68=0A= - return ((wxFileHistory*)_obj)->GetCount();=3D0D=0A= -}=3D0D=0A= - =3D0D=0A= -EWXWEXPORT(int,wxFileHistory_GetNoHistoryFiles)(void* _obj)=3D0D=0A= -{=3D0D=0A= +#if (wxVERSION_NUMBER <=3D3D 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljfilehist.cpp 70=0A= +#else=3D0D=0A= + return ((wxFileHistory*)_obj)->GetCount();=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljfontdlg.cpp 8=0A= +#ifdef wxMAC_USE_EXPERIMENTAL_FONTDIALOG=3D0D=0A= + return (void*) new wxFontDialog ((wxWindow*)_prt, (wxFontData&) = fnt);=3D0D=0A= +#else=3D0D=0A= hunk ./wxc/src/ewxw/eljfontdlg.cpp 12=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljicon.cpp 78=0A= +#if (wxVERSION_NUMBER <=3D3D 2800)=3D0D=0A= hunk ./wxc/src/ewxw/eljicon.cpp 80=0A= +#else=3D0D=0A= + wxIcon* icon1 =3D3D (wxIcon *)_obj;=3D0D=0A= + wxIcon* icon2 =3D3D (wxIcon *)other;=3D0D=0A= + wxBitmap bmp1;=3D0D=0A= + wxBitmap bmp2;=3D0D=0A= + bmp1.CopyFromIcon(*icon1);=3D0D=0A= + bmp2.CopyFromIcon(*icon2);=3D0D=0A= + wxImage image1 =3D3D (wxImage)bmp1.ConvertToImage();=3D0D=0A= + wxImage image2 =3D3D (wxImage)bmp2.ConvertToImage();=3D0D=0A= + wxImage* img1 =3D3D &image1;=3D0D=0A= + wxImage* img2 =3D3D &image2;=3D0D=0A= + if( (icon1->GetWidth() =3D3D=3D3D icon2->GetWidth()) &&=3D0D=0A= + (icon1->GetHeight() =3D3D=3D3D icon2->GetHeight()) &&=3D0D=0A= + (icon1->GetDepth() =3D3D=3D3D icon2->GetDepth())){=3D0D=0A= + bool equal =3D3D true;=3D0D=0A= + for(int sx=3D3D0;sx<(icon1->GetWidth());sx++){=3D0D=0A= + for(int sy=3D3D0;sy<(icon1->GetHeight());sy++){=3D0D=0A= + equal =3D3D equal &&=3D0D=0A= + (img1->GetRed(sx,sy)=3D3D=3D3Dimg2->GetRed(sx,sy) &&=3D0D=0A= + img1->GetGreen(sx,sy)=3D3D=3D3Dimg2->GetGreen(sx,sy) &&=3D0D=0A= + img1->GetBlue(sx,sy)=3D3D=3D3Dimg2->GetBlue(sx,sy) &&=3D0D=0A= + img1->GetAlpha(sx,sy)=3D3D=3D3Dimg2->GetAlpha(sx,sy));=3D0D=0A= + }=3D0D=0A= + }=3D0D=0A= + return (int)equal;=3D0D=0A= + } else {=3D0D=0A= + return 0;=3D0D=0A= + }=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljlistctrl.cpp 323=0A= -EWXWEXPORT(int, wxListCtrl_GetItemSpacing)(void* _obj, int isSmall)=3D0D=0A= +EWXWEXPORT(void, wxListCtrl_GetItemSpacing)(void* _obj, int isSmall, = int* =3D=0A= h, int* w)=3D0D=0A= hunk ./wxc/src/ewxw/eljlistctrl.cpp 325=0A= - return ((wxListCtrl*)_obj)->GetItemSpacing(isSmall !=3D3D 0);=3D0D=0A= +#if (wxVERSION_NUMBER <=3D3D 2600)=3D0D=0A= + int x =3D3D ((wxListCtrl*)_obj)->GetItemSpacing(isSmall !=3D3D 0);=3D0D=0A= + *h =3D3D x;=3D0D=0A= + *w =3D3D x;=3D0D=0A= +#else=3D0D=0A= + wxSize res =3D3D ((wxListCtrl*)_obj)->GetItemSpacing();=3D0D=0A= + *h =3D3D res.GetHeight();=3D0D=0A= + *w =3D3D res.GetWidth();=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljpalette.cpp 43=0A= +#if (wxVERSION_NUMBER <=3D3D 2800)=3D0D=0A= hunk ./wxc/src/ewxw/eljpalette.cpp 45=0A= +#else=3D0D=0A= + wxPalette* pal1 =3D3D (wxPalette *)_obj;=3D0D=0A= + wxPalette* pal2 =3D3D (wxPalette *)palette;=3D0D=0A= + if (pal1->GetColoursCount() =3D3D=3D3D pal2->GetColoursCount()){=3D0D=0A= + bool equal =3D3D true;=3D0D=0A= + unsigned char red1 =3D3D 0;=3D0D=0A= + unsigned char red2 =3D3D 0;=3D0D=0A= + unsigned char green1 =3D3D 0;=3D0D=0A= + unsigned char green2 =3D3D 0;=3D0D=0A= + unsigned char blue1 =3D3D 0;=3D0D=0A= + unsigned char blue2 =3D3D 0;=3D0D=0A= + for(int x =3D3D 0; x<(pal1->GetColoursCount()); x++){=3D0D=0A= + pal1->GetRGB(x, &red1, &green1, &blue1);=3D0D=0A= + pal2->GetRGB(x, &red2, &green2, &blue2);=3D0D=0A= + equal =3D3D equal && (red1=3D3D=3D3Dred2 && green1=3D3D=3D3Dgreen2 = && blue1=3D3D=3D3D=3D=0A= blue2); =3D0D=0A= + }=3D0D=0A= + return (int)equal;=3D0D=0A= + } else {=3D0D=0A= + return 0;=3D0D=0A= + }=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljpanel.cpp 18=0A= +#if (wxVERSION_NUMBER <=3D3D 2800)=3D0D=0A= hunk ./wxc/src/ewxw/eljpanel.cpp 20=0A= +#else=3D0D=0A= + return (void*)((wxTopLevelWindow*)_obj)->GetDefaultItem();=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljpanel.cpp 27=0A= +#if (wxVERSION_NUMBER <=3D3D 2800)=3D0D=0A= hunk ./wxc/src/ewxw/eljpanel.cpp 29=0A= +#else=3D0D=0A= + ((wxTopLevelWindow*)_obj)->SetDefaultItem((wxButton*) btn);=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 3=0A= +#if defined(wxUSE_POSTSCRIPT) && (wxUSE_POSTSCRIPT=3D3D=3D3D0)=3D0D=0A= +# undef wxUSE_POSTSCRIPT=3D0D=0A= +#endif=3D0D=0A= +=3D0D=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= +#include "wx/generic/prntdlgg.h"=3D0D=0A= +#endif=3D0D=0A= +=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 324=0A= +EWXWEXPORT(void*, wxPostScriptPrintNativeData_Create)()=3D0D=0A= +{=3D0D=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + return (void*) new wxPostScriptPrintNativeData();=3D0D=0A= +#else=3D0D=0A= + return NULL;=3D0D=0A= +#endif=3D0D=0A= +}=3D0D=0A= +=3D0D=0A= +EWXWEXPORT(void, wxPostScriptPrintNativeData_Delete)(void* _obj)=3D0D=0A= +{=3D0D=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + delete (wxPostScriptPrintNativeData*)_obj;=3D0D=0A= +#endif=3D0D=0A= +}=3D0D=0A= +=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 436=0A= +#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)=3D0D=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + wxString tmp =3D3D = ((wxPostScriptPrintNativeData*)_obj)->GetPrinterCommand(=3D=0A= );=3D0D=0A= +#else=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 441=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 444=0A= +#else=3D0D=0A= + return false;=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 451=0A= +#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)=3D0D=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + wxString tmp =3D3D = ((wxPostScriptPrintNativeData*)_obj)->GetPrinterOptions(=3D=0A= );=3D0D=0A= +#else=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 456=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 459=0A= +#else=3D0D=0A= + return false;=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 466=0A= +#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)=3D0D=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + wxString tmp =3D3D = ((wxPostScriptPrintNativeData*)_obj)->GetPreviewCommand(=3D=0A= );=3D0D=0A= +#else=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 471=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 474=0A= +#else=3D0D=0A= + return false;=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 488=0A= +#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)=3D0D=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + wxString tmp =3D3D = ((wxPostScriptPrintNativeData*)_obj)->GetFontMetricPath(=3D=0A= );=3D0D=0A= +#else=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 493=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 496=0A= +#else=3D0D=0A= + return false;=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 503=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + return ((wxPostScriptPrintNativeData*)_obj)->GetPrinterScaleX();=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 507=0A= +#else=3D0D=0A= + return false;=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 514=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + return ((wxPostScriptPrintNativeData*)_obj)->GetPrinterScaleY();=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 518=0A= +#else=3D0D=0A= + return false;=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 525=0A= - return (int)((wxPrintData*)_obj)->GetPrinterTranslateX();=3D0D=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + return = ((wxPostScriptPrintNativeData*)_obj)->GetPrinterTranslateX();=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= + return ((wxPrintData*)_obj)->GetPrinterTranslateX();=3D0D=0A= +#else=3D0D=0A= + return false;=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 536=0A= - return (int)((wxPrintData*)_obj)->GetPrinterTranslateY();=3D0D=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + return = ((wxPostScriptPrintNativeData*)_obj)->GetPrinterTranslateY();=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= + return ((wxPrintData*)_obj)->GetPrinterTranslateY();=3D0D=0A= +#else=3D0D=0A= + return false;=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 552=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + = ((wxPostScriptPrintNativeData*)_obj)->SetPrinterCommand((wxChar*)command)= =3D=0A= ;=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 556=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 561=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + = ((wxPostScriptPrintNativeData*)_obj)->SetPrinterOptions((wxChar*)options)= =3D=0A= ;=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 565=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 570=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + = ((wxPostScriptPrintNativeData*)_obj)->SetPreviewCommand((wxChar*)command)= =3D=0A= ;=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 574=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 584=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + = ((wxPostScriptPrintNativeData*)_obj)->SetFontMetricPath((wxChar*)path);=3D=0A= =3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 588=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 593=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + ((wxPostScriptPrintNativeData*)_obj)->SetPrinterScaleX(x);=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 597=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 602=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + ((wxPostScriptPrintNativeData*)_obj)->SetPrinterScaleY(y);=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 606=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 611=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + ((wxPostScriptPrintNativeData*)_obj)->SetPrinterScaling(x, y);=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 615=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 620=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + = ((wxPostScriptPrintNativeData*)_obj)->SetPrinterTranslateX((int)x);=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 624=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 629=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + = ((wxPostScriptPrintNativeData*)_obj)->SetPrinterTranslateY((int)y);=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 633=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 638=0A= +#ifdef wxUSE_POSTSCRIPT=3D0D=0A= + ((wxPostScriptPrintNativeData*)_obj)->SetPrinterTranslation((long)x, = (lon=3D=0A= g)y);=3D0D=0A= +#elif wxVERSION_NUMBER < 2600=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 642=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 714=0A= - =3D0D=0A= -EWXWEXPORT(int, wxPrintDialogData_GetSetupDialog)(void* _obj)=3D0D=0A= -{=3D0D=0A= - return (int)((wxPrintDialogData*)_obj)->GetSetupDialog();=3D0D=0A= -}=3D0D=0A= - =3D0D=0A= +=3D0D=0A= hunk ./wxc/src/ewxw/eljprinting.cpp 759=0A= - =3D0D=0A= -EWXWEXPORT(void, wxPrintDialogData_SetSetupDialog)(void* _obj, int = flag)=3D=0A= =3D0D=0A= -{=3D0D=0A= - ((wxPrintDialogData*)_obj)->SetSetupDialog(flag !=3D3D 0);=3D0D=0A= -}=3D0D=0A= - =3D0D=0A= +=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 84=0A= +#if (wxVERSION_NUMBER <=3D3D 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 86=0A= +#else=3D0D=0A= + ((wxSizerItem*)_obj)->SetProportion(option);=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 123=0A= +#if (wxVERSION_NUMBER < 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 125=0A= +#else=3D0D=0A= + return ((wxSizerItem*)_obj)->GetProportion();=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 199=0A= +#if (wxVERSION_NUMBER < 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 201=0A= +#else=3D0D=0A= + return (int)((wxSizer*)_obj)->Detach((wxWindow*) window);=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 289=0A= +#if (wxVERSION_NUMBER < 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 296=0A= -=3D0D=0A= +#else=3D0D=0A= + wxSizerItemList::compatibility_iterator node =3D3D = ((wxSizer*)_obj)->GetCh=3D=0A= ildren().GetFirst();=3D0D=0A= + while (node)=3D0D=0A= + {=3D0D=0A= + ((void**)_res)[i] =3D3D node->GetData();=3D0D=0A= + ++i;=3D0D=0A= + }=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 455=0A= +#if (wxVERSION_NUMBER < 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 457=0A= +#else=3D0D=0A= + return NULL;=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 464=0A= +#if (wxVERSION_NUMBER < 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 466=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 471=0A= +#if (wxVERSION_NUMBER < 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 475=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 480=0A= +#if (wxVERSION_NUMBER < 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljsizer.cpp 482=0A= +#else=3D0D=0A= + return NULL;=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljsystemsettings.cpp 6=0A= -EWXWEXPORT(void, wxSystemSettings_GetSystemColour)(int index, void* = _ref)=3D=0A= =3D0D=0A= +EWXWEXPORT(void, wxSystemSettings_GetSystemColour)(wxSystemColour = index, v=3D=0A= oid* _ref)=3D0D=0A= hunk ./wxc/src/ewxw/eljsystemsettings.cpp 8=0A= - *((wxColour*)_ref) =3D3D wxSystemSettings::GetSystemColour(index);=3D0D=0A= + *((wxColour*)_ref) =3D3D wxSystemSettings::GetColour(index);=3D0D=0A= hunk ./wxc/src/ewxw/eljsystemsettings.cpp 11=0A= -EWXWEXPORT(void, wxSystemSettings_GetSystemFont)(int index, void* = _ref)=3D0D=0A= +EWXWEXPORT(void, wxSystemSettings_GetSystemFont)(wxSystemFont index, = void*=3D=0A= _ref)=3D0D=0A= hunk ./wxc/src/ewxw/eljsystemsettings.cpp 13=0A= - *((wxFont*)_ref) =3D3D wxSystemSettings::GetSystemFont(index);=3D0D=0A= + *((wxFont*)_ref) =3D3D wxSystemSettings::GetFont(index);=3D0D=0A= hunk ./wxc/src/ewxw/eljsystemsettings.cpp 16=0A= -EWXWEXPORT(int, wxSystemSettings_GetSystemMetric)(int index)=3D0D=0A= +EWXWEXPORT(int, wxSystemSettings_GetSystemMetric)(wxSystemMetric = index)=3D0D=0A= hunk ./wxc/src/ewxw/eljsystemsettings.cpp 18=0A= - return wxSystemSettings::GetSystemMetric(index);=3D0D=0A= + return wxSystemSettings::GetMetric(index);=3D0D=0A= hunk ./wxc/src/ewxw/eljvalidator.cpp 68=0A= +#if (wxVERSION_NUMBER <=3D3D 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljvalidator.cpp 75=0A= +#else=3D0D=0A= + ((wxTextValidator*)_obj)->SetIncludes((const wxArrayString&)list);=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljvalidator.cpp 82=0A= +#if (wxVERSION_NUMBER <=3D3D 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljvalidator.cpp 89=0A= +#else=3D0D=0A= + wxArrayString arr =3D3D ((wxTextValidator*)_obj)->GetIncludes();=3D0D=0A= + if (_ref)=3D0D=0A= + {=3D0D=0A= + for (unsigned int i =3D3D 0; i < arr.GetCount(); i++)=3D0D=0A= + ((const wxChar**)_ref)[i] =3D3D wxStrdup (arr.Item(i).c_str());=3D0D=0A= + }=3D0D=0A= + return arr.GetCount();=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljvalidator.cpp 102=0A= +#if (wxVERSION_NUMBER <=3D3D 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljvalidator.cpp 109=0A= +#else=3D0D=0A= + ((wxTextValidator*)_obj)->SetExcludes((const wxArrayString&)list);=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljvalidator.cpp 116=0A= +#if (wxVERSION_NUMBER <=3D3D 2600)=3D0D=0A= hunk ./wxc/src/ewxw/eljvalidator.cpp 123=0A= +#else=3D0D=0A= + wxArrayString arr =3D3D ((wxTextValidator*)_obj)->GetExcludes();=3D0D=0A= + if (_ref)=3D0D=0A= + {=3D0D=0A= + for (unsigned int i =3D3D 0; i < arr.GetCount(); i++)=3D0D=0A= + ((const wxChar**)_ref)[i] =3D3D wxStrdup (arr.Item(i).c_str());=3D0D=0A= + }=3D0D=0A= + return arr.GetCount();=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/ewxw/eljwindow.cpp 661=0A= +#if (wxVERSION_NUMBER < 2800)=3D0D=0A= hunk ./wxc/src/ewxw/eljwindow.cpp 663=0A= +#else=3D0D=0A= + wxSize sz =3D3D ((wxWindow*)_obj)->GetEffectiveMinSize();=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/extra.cpp 10=0A= +#if (wxVERSION_NUMBER >=3D3D 2800)=0A= +#include <wx/numdlg.h>=0A= +#include <wx/power.h>=0A= +#endif=0A= +=0A= hunk ./wxc/src/extra.cpp 329=0A= +#if (wxVERSION_NUMBER <=3D3D 2800)=0A= hunk ./wxc/src/extra.cpp 331=0A= +#else=0A= + bool OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const = wxMous=3D=0A= eEvent& event);=0A= +#endif=0A= hunk ./wxc/src/extra.cpp 369=0A= +#if (wxVERSION_NUMBER < 2800)=0A= hunk ./wxc/src/extra.cpp 371=0A= +#else=0A= +bool wxcHtmlWindow::OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord = y, =3D=0A= const wxMouseEvent& event)=0A= +#endif=0A= hunk ./wxc/src/extra.cpp 376=0A= +#if (wxVERSION_NUMBER < 2800)=0A= hunk ./wxc/src/extra.cpp 378=0A= +#else=0A= + if (cell=3D3D=3D3DNULL) return 0;=0A= +#endif=0A= hunk ./wxc/src/extra.cpp 398=0A= +#if (wxVERSION_NUMBER >=3D3D 2800)=0A= + return 1;=0A= +#endif=0A= hunk ./wxc/src/extra.cpp 1224=0A= +#ifdef wxHAS_POWER_EVENTS=3D0D=0A= + wxT("POWER_EVENTS"),=3D0D=0A= +#endif=3D0D=0A= hunk ./wxc/src/extra.cpp 1942=0A= - return wxGetNumberFromUser(message, prompt, caption, value, min , = max, p=3D=0A= arent, wxPoint(x,y) );=0A= + return wxGetNumberFromUser(wxString(message), wxString(prompt), = wxString=3D=0A= (caption), value, min, max, parent, wxPoint(x, y) );=0A= hunk ./wxc/src/managed.cpp 210=0A= +#if (wxVERSION_NUMBER < 2800)=0A= hunk ./wxc/src/managed.cpp 221=0A= +#else=0A= +#define IsStatic(obj,statics) \=0A= + { \=0A= + int i; \=0A= + if (obj=3D3D=3D3DNULL) return true; \=0A= + for( i =3D3D 0; statics[i] !=3D3D NULL; i++ ) \=0A= + { \=0A= + if (statics[i] =3D3D=3D3D obj) return true; \=0A= + } \=0A= + return false; \=0A= + }=0A= +#endif=0A= hunk ./wxc/src/managed.cpp 237=0A= +#if (wxVERSION_NUMBER < 2800)=0A= hunk ./wxc/src/managed.cpp 252=0A= - =3D=0A= =0A= +#else=0A= + static const wxBrush* staticsBrush[] =3D3D=0A= + {wxNULL_BRUSH=0A= + ,wxBLUE_BRUSH=0A= + ,wxGREEN_BRUSH=0A= + ,wxWHITE_BRUSH=0A= + ,wxBLACK_BRUSH=0A= + ,wxGREY_BRUSH=0A= + ,wxMEDIUM_GREY_BRUSH=0A= + ,wxLIGHT_GREY_BRUSH=0A= + ,wxTRANSPARENT_BRUSH=0A= + ,wxCYAN_BRUSH=0A= + ,wxRED_BRUSH=0A= + ,NULL=0A= + };=0A= +#endif=0A= hunk ./wxc/src/managed.cpp 296=0A= +#if (wxVERSION_NUMBER < 2800)=0A= hunk ./wxc/src/managed.cpp 308=0A= +#else=0A= +static const wxColour* staticsColour[] =3D3D =3D=0A= =0A= + {wxNULL_COLOUR=0A= + ,wxBLACK=0A= + ,wxWHITE=0A= + ,wxRED=0A= + ,wxBLUE=0A= + ,wxGREEN=0A= + ,wxCYAN=0A= + ,wxLIGHT_GREY=0A= + ,NULL=0A= + };=0A= +#endif=0A= hunk ./wxc/src/managed.cpp 350=0A= +#if (wxVERSION_NUMBER < 2800)=0A= hunk ./wxc/src/managed.cpp 358=0A= +#else=0A= +static const wxCursor* staticsCursor[] =3D3D =3D=0A= =0A= + {wxNULL_CURSOR=0A= + ,wxSTANDARD_CURSOR=0A= + ,wxHOURGLASS_CURSOR=0A= + ,wxCROSS_CURSOR=0A= + ,NULL=0A= + };=0A= +#endif=0A= hunk ./wxc/src/managed.cpp 397=0A= +#if (wxVERSION_NUMBER < 2800)=0A= hunk ./wxc/src/managed.cpp 406=0A= +#else=0A= +static const wxFont* staticsFont[] =3D3D =3D=0A= =0A= + {wxNULL_FONT=0A= + ,wxNORMAL_FONT=0A= + ,wxSMALL_FONT=0A= + ,wxITALIC_FONT=0A= + ,wxSWISS_FONT=0A= + ,NULL=0A= + };=0A= +#endif=0A= hunk ./wxc/src/managed.cpp 446=0A= +#if (wxVERSION_NUMBER < 2800)=0A= hunk ./wxc/src/managed.cpp 461=0A= +#else=0A= +static const wxPen* staticsPen[] =3D3D =3D=0A= =0A= + {wxNULL_PEN=0A= + ,wxRED_PEN=0A= + ,wxCYAN_PEN=0A= + ,wxGREEN_PEN=0A= + ,wxBLACK_PEN=0A= + ,wxWHITE_PEN=0A= + ,wxTRANSPARENT_PEN=0A= + ,wxBLACK_DASHED_PEN=0A= + ,wxGREY_PEN=0A= + ,wxMEDIUM_GREY_PEN=0A= + ,wxLIGHT_GREY_PEN=0A= + ,NULL=0A= + };=0A= +#endif=0A= hunk ./wxc/src/sound.cpp 38=0A= -EWXWEXPORT(wxSound*,wxWave_Create)( wxString* fileName, bool isResource = ) =3D=0A= =3D=0A= =0A= +EWXWEXPORT(wxSound*,wxSound_Create)( wxString* fileName, bool = isResource )=3D=0A= =3D=0A= =0A= hunk ./wxc/src/sound.cpp 47=0A= -EWXWEXPORT(void,wxWave_Delete)(wxSound* self) =3D=0A= =0A= +EWXWEXPORT(void,wxSound_Delete)(wxSound* self) =3D=0A= =0A= hunk ./wxc/src/sound.cpp 54=0A= -EWXWEXPORT(bool,wxWave_IsOk)(wxSound* self) =3D=0A= =0A= +EWXWEXPORT(bool,wxSound_IsOk)(wxSound* self) =3D=0A= =0A= hunk ./wxc/src/sound.cpp 63=0A= -#if (WXWIN_COMPATIBILITY_2_4=3D3D=3D3D1)=0A= -EWXWEXPORT(bool,wxWave_Play)(wxSound* self, bool async, bool looped ) =3D=0A= =0A= +EWXWEXPORT(bool,wxSound_Play)(wxSound* self, unsigned flag ) =3D=0A= =0A= hunk ./wxc/src/sound.cpp 66=0A= - return ((wxSoundBase *) self)->Play(async,looped);=0A= + return ((wxSoundBase *) self)->Play(flag);=0A= hunk ./wxc/src/sound.cpp 71=0A= +=0A= +EWXWEXPORT(bool,wxSound_PlayCompatible)(wxSound* self, bool async, bool = lo=3D=0A= oped ) =3D=0A= =0A= +{=0A= +#if (WXWIN_COMPATIBILITY_2_4=3D3D=3D3D1) && defined(wxUSE_SOUND)=0A= + return ((wxSoundBase *) self)->Play(async,looped);=0A= +#else=0A= + return false;=0A= hunk ./wxc/src/sound.cpp 79=0A= +}=0A= hunk ./wxc/src/sound.cpp 86=0A= -EWXWEXPORT(wxWave*,wxWave_Create)( wxString* fileName, bool isResource = ) =3D=0A= =0A= +EWXWEXPORT(wxWave*,wxSound_Create)( wxString* fileName, bool isResource = ) =3D=0A= =3D=0A= =0A= hunk ./wxc/src/sound.cpp 95=0A= -EWXWEXPORT(void,wxWave_Delete)(wxWave* self) =3D=0A= =0A= +EWXWEXPORT(void,wxSound_Delete)(wxWave* self) =3D=0A= =0A= hunk ./wxc/src/sound.cpp 102=0A= -EWXWEXPORT(bool,wxWave_IsOk)(wxWave* self) =3D=0A= =0A= +EWXWEXPORT(bool,wxSound_IsOk)(wxWave* self) =3D=0A= =0A= hunk ./wxc/src/sound.cpp 111=0A= -EWXWEXPORT(bool,wxWave_Play)(wxWave* self, bool async, bool looped ) =3D=0A= =0A= +EWXWEXPORT(bool,wxSound_PlayCompatible)(wxWave* self, bool async, bool = loo=3D=0A= ped ) =3D=0A= =0A= hunk ./wxc/src/stc.cpp 35=0A= - EWXWEXPORT(void*, wxStyledTextCtrl_GetCaretLineBack) (void* _obj)=0A= + EWXWEXPORT(void*, wxStyledTextCtrl_GetCaretLineBackground) (void* = _obj)=0A= hunk ./wxc/src/stc.cpp 38=0A= +#if (wxVERSION_NUMBER < 2800)=0A= hunk ./wxc/src/stc.cpp 40=0A= +#else=0A= + wxColour c =3D3D ((wxStyledTextCtrl*) = _obj)->GetCaretLineBackground();=0A= +#endif=0A= hunk ./wxc/src/stc.cpp 49=0A= +EWXWEXPORT(void, wxStyledTextCtrl_SetCaretLineBackground)(void* _obj, = int =3D=0A= back_r, int back_g, int back_b)=0A= +{=0A= +#ifdef wxUSE_STC=0A= +#if (wxVERSION_NUMBER < 2800)=0A= + ((wxStyledTextCtrl*) = _obj)->SetCaretLineBack(wxColour(back_r,back_g,bac=3D=0A= k_b));=0A= +#else=0A= + /* SetCaretLineBack is changed name to SetCaretLineBackground.=0A= + So I avoid to use stc_gen.cpp for backward compatibility. */=0A= + ((wxStyledTextCtrl*) = _obj)->SetCaretLineBackground(wxColour(back_r,back=3D=0A= _g,back_b));=0A= +#endif=0A= +#endif=0A= +}=0A= hunk ./wxc/src/treectrl.cpp 67=0A= +// FIXME: wxHaskell uses this function in = Graphics.UI.WXCore.WxcTypes.with=3D=0A= TreeItemIdPtr=0A= +// to make wxTreeItemId.=0A= +//=0A= +// But wxWidgets' document says: wxTreemItemIds are not meant to be = constr=3D=0A= ucted=0A= +// explicitly by the user; they are returned by the wxTreeCtrl = functions i=3D=0A= nstead.=0A= +//=0A= +// = http://www.wxwindows.org/manuals/2.8/wx_wxtreeitemid.html#wxtreeitemid=0A= +//=0A= +// So we must remove this function and replace treeItemId = implementation i=3D=0A= n the=0A= +// funture.=0A= hunk ./wxc/src/treectrl.cpp 79=0A= +#if wxVERSION_NUMBER < 2800=0A= hunk ./wxc/src/treectrl.cpp 81=0A= +#else=0A= + return new wxTreeItemId( reinterpret_cast<void*>(value) );=0A= +#endif=0A= hunk ./wxc/src/treectrl.cpp 325=0A= - #if wxCHECK_VERSION(2,5,0)=0A= + #if wxCHECK_VERSION(2,5,0) && !wxCHECK_VERSION(2,8,0)=0A= hunk ./wxc/src/treectrl.cpp 346=0A= +#if wxVERSION_NUMBER < 2600=0A= hunk ./wxc/src/treectrl.cpp 348=0A= +#else=0A= + (*(wxTreeItemId*)_item) =3D3D = ((wxTreeCtrl*)_obj)->GetFirstChild(*((wxTreeI=3D=0A= temId*)item), cookie);=0A= +#endif=0A= hunk ./wxc/src/treectrl.cpp 355=0A= +#if wxVERSION_NUMBER < 2600=0A= hunk ./wxc/src/treectrl.cpp 357=0A= +#else=0A= + (*(wxTreeItemId*)_item) =3D3D = ((wxTreeCtrl*)_obj)->GetNextChild(*((wxTreeIt=3D=0A= emId*)item), cookie);=0A= +#endif=0A= hunk ./wxc/src/wrapper.cpp 382=0A= +#if wxVERSION_NUMBER <=3D3D 2600=0A= hunk ./wxc/src/wrapper.cpp 384=0A= +#else=0A= + wxAppTraits* appTraits =3D3D wxGetApp().GetTraits();=0A= + return appTraits->CreateLogTarget();=0A= +#endif=0A= hunk ./wxc/src/wrapper.cpp 544=0A= +#if (wxVERSION_NUMBER < 2600)=0A= hunk ./wxc/src/wrapper.cpp 546=0A= +#else=0A= + wxMilliSleep(_mscs);=0A= +#endif=0A= hunk ./wxc/wxc-2.4.dsp 147=0A= -SOURCE=3D3D.\include\wave.h=3D0D=0A= +SOURCE=3D3D.\include\sound.h=3D0D=0A= hunk ./wxc/wxc-2.4.dsp 239=0A= -SOURCE=3D3D.\src\wave.cpp=3D0D=0A= +SOURCE=3D3D.\src\sound.cpp=3D0D=0A= hunk ./wxc/wxc-2.6.dsp 129=0A= -SOURCE=3D3D.\include\wave.h=3D0D=0A= +SOURCE=3D3D.\include\sound.h=3D0D=0A= hunk ./wxc/wxc-2.6.dsp 241=0A= -SOURCE=3D3D.\src\wave.cpp=3D0D=0A= +SOURCE=3D3D.\src\sound.cpp=3D0D=0A= addfile ./wxc/wxc-2.8.dsp=0A= hunk ./wxc/wxc-2.8.dsp 1=0A= +# Microsoft Developer Studio Project File - Name=3D3D"wxc" - Package = Owner=3D=0A= =3D3D<4>=3D0D=0A= +# Microsoft Developer Studio Generated Build File, Format Version = 6.00=3D0D=0A= +# ** DO NOT EDIT **=3D0D=0A= +=3D0D=0A= +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102=3D0D=0A= +=3D0D=0A= +CFG=3D3Dwxc - Win32 Debug=3D0D=0A= +!MESSAGE This is not a valid makefile. To build this project using = NMAKE,=3D=0A= =3D0D=0A= +!MESSAGE use the Export Makefile command and run=3D0D=0A= +!MESSAGE =3D0D=0A= +!MESSAGE NMAKE /f "wxc-2.8.mak".=3D0D=0A= +!MESSAGE =3D0D=0A= +!MESSAGE You can specify a configuration when running NMAKE=3D0D=0A= +!MESSAGE by defining the macro CFG on the command line. For = example:=3D0D=0A= +!MESSAGE =3D0D=0A= +!MESSAGE NMAKE /f "wxc-2.8.mak" CFG=3D3D"wxc - Win32 Debug"=3D0D=0A= +!MESSAGE =3D0D=0A= +!MESSAGE Possible choices for configuration are:=3D0D=0A= +!MESSAGE =3D0D=0A= +!MESSAGE "wxc - Win32 Release" (based on "Win32 (x86) Dynamic-Link = Library=3D=0A= ")=3D0D=0A= +!MESSAGE "wxc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link = Library")=3D=0A= =3D0D=0A= +!MESSAGE =3D0D=0A= +=3D0D=0A= +# Begin Project=3D0D=0A= +# PROP AllowPerConfigDependencies 0=3D0D=0A= +# PROP Scc_ProjName ""=3D0D=0A= +# PROP Scc_LocalPath ""=3D0D=0A= +CPP=3D3Dcl.exe=3D0D=0A= +MTL=3D3Dmidl.exe=3D0D=0A= +RSC=3D3Drc.exe=3D0D=0A= +=3D0D=0A= +!IF "$(CFG)" =3D3D=3D3D "wxc - Win32 Release"=3D0D=0A= +=3D0D=0A= +# PROP BASE Use_MFC 0=3D0D=0A= +# PROP BASE Use_Debug_Libraries 0=3D0D=0A= +# PROP BASE Output_Dir "Release"=3D0D=0A= +# PROP BASE Intermediate_Dir "Release"=3D0D=0A= +# PROP BASE Target_Dir ""=3D0D=0A= +# PROP Use_MFC 0=3D0D=0A= +# PROP Use_Debug_Libraries 0=3D0D=0A= +# PROP Output_Dir "..\out\wxc"=3D0D=0A= +# PROP Intermediate_Dir "..\out\wxc\release"=3D0D=0A= +# PROP Ignore_Export_Lib 0=3D0D=0A= +# PROP Target_Dir ""=3D0D=0A= +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D = "_WINDOWS=3D=0A= " /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=3D0D=0A= +# ADD CPP /nologo /MT /W3 /GX /O2 /I = "..\..\wxMSW-2.8.7\lib\vc_lib\mswu" /=3D=0A= I "..\..\wxMSW-2.8.7\contrib\include" /I "include" /I "src\ewxw" /I = "..\..\=3D=0A= wxMSW-2.8.7\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D = "_U=3D=0A= SRDLL" /D "WXC_EXPORTS" /D WINVER=3D3D0x400 /D "_MT" /D wxUSE_GUI=3D3D1 = /D wxUS=3D=0A= E_UNICODE=3D3D1 /D wxUSE_STC=3D3D1 /D BUILD_WXC=3D3D1 /D "_DLL" /YX /FD = /c=3D0D=0A= +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32=3D0D=0A= +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32=3D0D=0A= +# ADD BASE RSC /l 0x413 /d "NDEBUG"=3D0D=0A= +# ADD RSC /l 0x409 /i "..\..\wxMSW-2.8.7\include" /d "NDEBUG"=3D0D=0A= +BSC32=3D3Dbscmake.exe=3D0D=0A= +# ADD BASE BSC32 /nologo=3D0D=0A= +# ADD BSC32 /nologo=3D0D=0A= +LINK32=3D3Dlink.exe=3D0D=0A= +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib = comdlg32.=3D=0A= lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib = odb=3D=0A= ccp32.lib /nologo /dll /machine:I386=3D0D=0A= +=3D0D=0A= +# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib = wxexp=3D=0A= at.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib = wxbase28u_xml.lib=3D=0A= wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib = wxm=3D=0A= sw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib kernel32.lib = user32.lib =3D=0A= gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib = olea=3D=0A= ut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib = wsock32.l=3D=0A= ib opengl32.lib winmm.lib /nologo /dll /machine:I386 = /nodefaultlib:"LIBCMT"=3D=0A= /out:"..\out\wxc\wxc-msw2.8.7-0.10.1.dll" = /libpath:"..\..\wxMSW-2.8.7\lib\=3D=0A= vc_lib"=3D0D=0A= +# Begin Special Build Tool=3D0D=0A= +SOURCE=3D3D"$(InputPath)"=3D0D=0A= +PostBuild_Cmds=3D3Decho Generating mingw32 import library ... = ..\bin\reimp .=3D=0A= .\out\wxc\wxc-msw2.8.7-0.10.1.lib move libwxc-msw2.8.7-0.10.1.a = ..\out\wxc =3D=0A= move wxc-msw2.8.7-0.10.1.def ..\out\wxc echo Done.=3D0D=0A= +# End Special Build Tool=3D0D=0A= +=3D0D=0A= +!ELSEIF "$(CFG)" =3D3D=3D3D "wxc - Win32 Debug"=3D0D=0A= +=3D0D=0A= +# PROP BASE Use_MFC 0=3D0D=0A= +# PROP BASE Use_Debug_Libraries 1=3D0D=0A= +# PROP BASE Output_Dir "Debug"=3D0D=0A= +# PROP BASE Intermediate_Dir "Debug"=3D0D=0A= +# PROP BASE Target_Dir ""=3D0D=0A= +# PROP Use_MFC 0=3D0D=0A= +# PROP Use_Debug_Libraries 1=3D0D=0A= +# PROP Output_Dir "..\out\wxc"=3D0D=0A= +# PROP Intermediate_Dir "..\out\wxc\debug"=3D0D=0A= +# PROP Ignore_Export_Lib 0=3D0D=0A= +# PROP Target_Dir ""=3D0D=0A= +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" = /D =3D=0A= "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=3D0D=0A= +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I = "..\..\wxMSW-2.8.7\lib\vc_li=3D=0A= b\mswud" /I "include" /I "src\ewxw" /I "..\..\wxMSW-2.8.7\include" /I = "..\.=3D=0A= .\wxMSW-2.8.7\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D = WXDEBUG=3D3D1 =3D=0A= /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D = WINVER=3D=0A= =3D3D0x400 /D "_MT" /D wxUSE_GUI=3D3D1 /D wxUSE_UNICODE=3D3D1 /D = wxUSE_STC=3D3D1 /D=3D=0A= BUILD_WXC=3D3D1 /D "_DLL" /YX /FD /GZ /c=3D0D=0A= +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32=3D0D=0A= +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32=3D0D=0A= +# ADD BASE RSC /l 0x413 /d "_DEBUG"=3D0D=0A= +# ADD RSC /l 0x409 /i "..\..\wxMSW-2.8.7\include" /d "_DEBUG"=3D0D=0A= +BSC32=3D3Dbscmake.exe=3D0D=0A= +# ADD BASE BSC32 /nologo=3D0D=0A= +# ADD BSC32 /nologo=3D0D=0A= +LINK32=3D3Dlink.exe=3D0D=0A= +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib = comdlg32.=3D=0A= lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib = odb=3D=0A= ccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept=3D0D=0A= +=3D0D=0A= +# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib = wxtiffd.lib =3D=0A= wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib = wxbase28=3D=0A= ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib = wxmsw2=3D=0A= 8ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib = kernel3=3D=0A= 2.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib = shell32.l=3D=0A= ib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib = rpc=3D=0A= rt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug = /machine:I38=3D=0A= 6 /nodefaultlib:"LIBCMTD" /out:"..\out\wxc\wxcd-msw2.8.7-0.10.1.dll" = /pdbty=3D=0A= pe:sept /libpath:"..\..\wxMSW-2.8.7\lib\vc_lib"=3D0D=0A= +# Begin Special Build Tool=3D0D=0A= +SOURCE=3D3D"$(InputPath)"=3D0D=0A= +PostBuild_Cmds=3D3Decho Generating mingw32 import library ... = ..\bin\reimp .=3D=0A= .\out\wxc\wxcd-msw2.8.7-0.10.1.lib move libwxcd-msw2.8.7-0.10.1.a = ..\out\wx=3D=0A= c move wxcd-msw2.8.7-0.10.1.def ..\out\wxc echo Done.=3D0D=0A= +# End Special Build Tool=3D0D=0A= +=3D0D=0A= +!ENDIF =3D0D=0A= +=3D0D=0A= +# Begin Target=3D0D=0A= +=3D0D=0A= +# Name "wxc - Win32 Release"=3D0D=0A= +# Name "wxc - Win32 Debug"=3D0D=0A= +# Begin Group "Header Files"=3D0D=0A= +=3D0D=0A= +# PROP Default_Filter "h;hpp;hxx;hm;inl"=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\db.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\dragimage.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\ewxw_def.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\glcanvas.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\managed.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\mediactrl.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\sound.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\previewframe.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\printout.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\stc.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\stc_gen.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\textstream.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\wrapper.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\include\wxc.h=3D0D=0A= +# End Source File=3D0D=0A= +# End Group=3D0D=0A= +# Begin Group "Resource Files"=3D0D=0A= +=3D0D=0A= +# PROP Default_Filter = "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"=3D=0A= =3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\wxc.rc=3D0D=0A= +# End Source File=3D0D=0A= +# End Group=3D0D=0A= +# Begin Group "Source Files"=3D0D=0A= +=3D0D=0A= +# PROP Default_Filter "*.cpp"=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\apppath.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\db.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\dragimage.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\eljevent.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\eljmime.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw_main.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\extra.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\glcanvas.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\image.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\managed.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\mediactrl.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\previewframe.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\printout.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\stc.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\taskbaricon.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\textstream.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\treectrl.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\sound.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\wrapper.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# End Group=3D0D=0A= +# Begin Group "ewxw"=3D0D=0A= +=3D0D=0A= +# PROP Default_Filter ""=3D0D=0A= +# Begin Group "ewxw sources"=3D0D=0A= +=3D0D=0A= +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljaccelerator.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljartprov.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljbitmap.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljbrush.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljbusyinfo.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljbutton.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljcalendarctrl.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljcaret.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljcheckbox.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljchecklistbox.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljchoice.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljclipboard.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljcoldata.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljcolour.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljcolourdlg.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljcombobox.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljconfigbase.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljcontrol.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljctxhelp.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljcursor.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljdataformat.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljdatetime.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljdc.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljdialog.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljdialup.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljdirdlg.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljdnd.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljdrawing.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljfiledialog.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljfilehist.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljfindrepldlg.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljfont.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljfontdata.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljfontdlg.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljframe.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljgauge.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljgrid.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljhelpcontroller.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljicnbndl.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljicon.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljimage.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljimagelist.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljipc.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljlayoutconstraints.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljlistbox.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljlistctrl.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljlocale.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljlog.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljmask.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljmdi.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljmenu.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljmenubar.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljmessagedialog.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljminiframe.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljnotebook.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljpalette.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljpanel.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljpen.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljprintdlg.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljprinting.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljprocess.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljradiobox.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljradiobutton.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljregion.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljregioniter.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljsash.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljscintilla.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljscrollbar.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljscrolledwindow.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljsingleinst.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljsizer.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljslider.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljspinctrl.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljsplitterwindow.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljstaticbox.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljstaticline.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljstatictext.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljstatusbar.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljsystemsettings.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljtextctrl.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljtglbtn.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljthread.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljtimer.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljtipwnd.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljtoolbar.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljvalidator.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljwindow.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\eljwizard.cpp=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\ewxw\Scintilla.h=3D0D=0A= +# End Source File=3D0D=0A= +# End Group=3D0D=0A= +# Begin Group "ewxw headers"=3D0D=0A= +=3D0D=0A= +# PROP Default_Filter ... [truncated message content] |
