From: shelarcy <she...@gm...> - 2008-06-25 10:03:17
|
DarcsURL: C:/home/shelarcy/wxhaskell MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_" --=_ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Wed Jun 25 14:20:46 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc= y...@gm...> * Just reviving ELJ's wxXmlResource code. Wed Jun 25 18:58:58 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc= y...@gm...> * Fix: eljdcsvg.cpp doesn't build other than Windows. --=_ Content-Type: text/x-darcs-patch; name="just-reviving-elj_s-wxxmlresource-code_.dpatch" Content-Transfer-Encoding: quoted-printable Content-Description: A darcs patch for your repository! New patches: [Just reviving ELJ's wxXmlResource code. shelarcy <she...@gm...>**20080625052046] { hunk ./makefile 160 - printdlg printing process radiobox radiobutton region \ + printdlg printing process radiobox radiobutton rc region \ hunk ./wxc/include/wxc_glue.h 4831 -int wxXmlResource_AttachUnknownControl( TSelf(wxXmlResource) _obj, = TStringVoid name, TClass(wxControl) control, TClass(wxWindow) parent );=0D +int wxXmlResource_AttachUnknownControl( TSelf(wxXmlResource) _obj, = TClass(wxString) name, TClass(wxControl) control, TClass(wxWindow) parent )= ;=0D hunk ./wxc/include/wxc_glue.h 4834 -TClass(wxXmlResource) wxXmlResource_Create( void* _obj, int flags );=0D -TClass(wxXmlResource) wxXmlResource_CreateFromFile( TSelf(wxXmlResource) _= obj, void* filemask, int flags );=0D +TClass(wxXmlResource) wxXmlResource_Create( int flags );=0D +TClass(wxXmlResource) wxXmlResource_CreateFromFile( TClass(wxString) filem= ask, int flags );=0D hunk ./wxc/include/wxc_glue.h 4837 -void* wxXmlResource_Get( );=0D +TClass(wxXmlResource) wxXmlResource_Get( );=0D +TStringLen wxXmlResource_GetDomain( TSelf(wxXmlResource) _obj, TStringOut = domain );=0D hunk ./wxc/include/wxc_glue.h 4841 -int wxXmlResource_GetXRCID( TSelf(wxXmlResource) str_id );=0D +int wxXmlResource_GetXRCID( TSelf(wxXmlResource) _obj, TSelf(wxXmlR= esource) str_id );=0D hunk ./wxc/include/wxc_glue.h 4843 -int wxXmlResource_InitializeObject( TSelf(wxXmlResource) _obj, void= * _inst, TClass(wxWindow) parent, TStringVoid name, void* classname );=0D +int wxXmlResource_InitializeObject( TSelf(wxXmlResource) _obj, TSel= f(wxObject) _inst, TClass(wxWindow) parent, TClass(wxString) name, TClass(w= xString) classname );=0D hunk ./wxc/include/wxc_glue.h 4845 -int wxXmlResource_Load( TSelf(wxXmlResource) _obj, void* filemask )= ;=0D -void wxXmlResource_LoadBitmap( TSelf(wxXmlResource) _obj, TStringVoi= d name, TClassRef(wxBitmap) _ref );=0D -void* wxXmlResource_LoadDialog( TSelf(wxXmlResource) _obj, TClass(wxW= indow) parent, TStringVoid name );=0D -void* wxXmlResource_LoadFrame( TSelf(wxXmlResource) _obj, TClass(wxWi= ndow) parent, TStringVoid name );=0D -void wxXmlResource_LoadIcon( TSelf(wxXmlResource) _obj, TStringVoid = name, TClassRef(wxIcon) _ref );=0D -void* wxXmlResource_LoadMenu( TSelf(wxXmlResource) _obj, TStringVoid = name );=0D -void* wxXmlResource_LoadMenuBar( TSelf(wxXmlResource) _obj, TClass(wx= Window) parent, TStringVoid name );=0D -void* wxXmlResource_LoadObject( TSelf(wxXmlResource) _obj, TClass(wxW= indow) parent, TStringVoid name, void* classname );=0D -void* wxXmlResource_LoadPanel( TSelf(wxXmlResource) _obj, TClass(wxWi= ndow) parent, TStringVoid name );=0D -void* wxXmlResource_LoadToolBar( TSelf(wxXmlResource) _obj, TClass(wx= Window) parent, TStringVoid name );=0D -void* wxXmlResource_Set( TSelf(wxXmlResource) res );=0D +int wxXmlResource_Load( TSelf(wxXmlResource) _obj, TClass(wxString)= filemask );=0D +void wxXmlResource_LoadBitmap( TSelf(wxXmlResource) _obj, TClass(wxS= tring) name, TClassRef(wxBitmap) _ref );=0D +TClass(wxDialog) wxXmlResource_LoadDialog( TSelf(wxXmlResource) _obj, TCla= ss(wxWindow) parent, TClass(wxString) name );=0D +TClass(wxFrame) wxXmlResource_LoadFrame( TSelf(wxXmlResource) _obj, TClass= (wxWindow) parent, TClass(wxString) name );=0D +void wxXmlResource_LoadIcon( TSelf(wxXmlResource) _obj, TClass(wxStr= ing) name, TClassRef(wxIcon) _ref );=0D +TClass(wxMenu) wxXmlResource_LoadMenu( TSelf(wxXmlResource) _obj, TClass(w= xString) name );=0D +TClass(wxMenuBar) wxXmlResource_LoadMenuBar( TSelf(wxXmlResource) _obj, TC= lass(wxWindow) parent, TClass(wxString) name );=0D +TClass(wxObject) wxXmlResource_LoadObject( TSelf(wxXmlResource) _obj, TCla= ss(wxWindow) parent, TClass(wxString) name, TClass(wxString) classname );= =0D +TClass(wxPanel) wxXmlResource_LoadPanel( TSelf(wxXmlResource) _obj, TClass= (wxWindow) parent, TClass(wxString) name );=0D +TClass(wxToolBar) wxXmlResource_LoadToolBar( TSelf(wxXmlResource) _obj, TC= lass(wxWindow) parent, TClass(wxString) name );=0D +TBool wxXmlResource_Unload( TSelf(wxXmlResource) _obj, TClass(wxStrin= g) filemask );=0D +TClass(wxXmlResource) wxXmlResource_Set( TSelf(wxXmlResource) _obj, TSelf(= wxXmlResource) res );=0D +void wxXmlResource_SetDomain( TSelf(wxXmlResource) _obj, TString dom= ain );=0D hunk ./wxc/src/eljrc.cpp 2 -#if wxVERSION_NUMBER >=3D 2400=0D +#include <wx/xrc/xmlres.h>=0D hunk ./wxc/src/eljrc.cpp 4 -#ifdef __WIN32__=0D -#define LoadBitmap LoadBitmapA=0D -#define LoadIcon LoadIconA=0D +#ifdef wxUSE_STC=0D +# include "wx/stc/stc.h"=0D hunk ./wxc/src/eljrc.cpp 8 -#include "eljscintilla.h"=0D -#include "wx/xrc/xmlres.h"=0D -=0D hunk ./wxc/src/eljrc.cpp 32 -class wxScintillaXmlHandler : public wxXmlResourceHandler=0D +#ifdef wxUSE_STC=0D +class wxStyledTextCtrlXmlHandler : public wxXmlResourceHandler=0D hunk ./wxc/src/eljrc.cpp 36 - wxScintillaXmlHandler();=0D + wxStyledTextCtrlXmlHandler();=0D hunk ./wxc/src/eljrc.cpp 40 +#endif=0D hunk ./wxc/src/eljrc.cpp 223 -wxScintillaXmlHandler::wxScintillaXmlHandler() : wxXmlResourceHandler()=0D +#ifdef wxUSE_STC=0D +wxStyledTextCtrlXmlHandler::wxStyledTextCtrlXmlHandler() : wxXmlResourceHa= ndler()=0D hunk ./wxc/src/eljrc.cpp 230 -wxObject *wxScintillaXmlHandler::DoCreateResource()=0D +wxObject *wxStyledTextCtrlXmlHandler::DoCreateResource()=0D hunk ./wxc/src/eljrc.cpp 232 - XRC_MAKE_INSTANCE(frame, wxScintilla);=0D + XRC_MAKE_INSTANCE(frame, wxStyledTextCtrl);=0D hunk ./wxc/src/eljrc.cpp 238 - wxDefaultValidator,=0D hunk ./wxc/src/eljrc.cpp 250 -bool wxScintillaXmlHandler::CanHandle(wxXmlNode *node)=0D +bool wxStyledTextCtrlXmlHandler::CanHandle(wxXmlNode *node)=0D hunk ./wxc/src/eljrc.cpp 252 - return IsOfClass(node, wxT("wxScintilla"));=0D + return IsOfClass(node, wxT("wxStyledTextCtrl"));=0D hunk ./wxc/src/eljrc.cpp 254 +#endif=0D hunk ./wxc/src/eljrc.cpp 297 -EWXWEXPORT(void*,wxXmlResource_Create)(void* _obj, int flags)=0D +EWXWEXPORT(wxXmlResource*,wxXmlResource_Create)(int flags)=0D hunk ./wxc/src/eljrc.cpp 299 - return (void*)new wxXmlResource(flags);=0D + return new wxXmlResource(flags);=0D hunk ./wxc/src/eljrc.cpp 302 -EWXWEXPORT(void*,wxXmlResource_CreateFromFile)(void* _obj, void* filemask,= int flags)=0D +EWXWEXPORT(wxXmlResource*,wxXmlResource_CreateFromFile)(wxString* filemask= , int flags)=0D hunk ./wxc/src/eljrc.cpp 304 - return (void*)new wxXmlResource((char*)filemask, flags);=0D + return new wxXmlResource(*filemask, flags);=0D hunk ./wxc/src/eljrc.cpp 307 -EWXWEXPORT(void,wxXmlResource_Delete)(void* _obj)=0D +EWXWEXPORT(void,wxXmlResource_Delete)(wxXmlResource* self)=0D hunk ./wxc/src/eljrc.cpp 309 - delete (wxXmlResource*)_obj;=0D + delete self;=0D hunk ./wxc/src/eljrc.cpp 312 -EWXWEXPORT(int,wxXmlResource_Load)(void* _obj, void* filemask)=0D +EWXWEXPORT(bool,wxXmlResource_Load)(wxXmlResource* self, wxString* filemas= k)=0D hunk ./wxc/src/eljrc.cpp 315 - return (int)((wxXmlResource*)_obj)->Load((char*)filemask);=0D + return self->Load(*filemask);=0D hunk ./wxc/src/eljrc.cpp 318 -EWXWEXPORT(void,wxXmlResource_InitAllHandlers)(void* _obj)=0D +EWXWEXPORT(void,wxXmlResource_InitAllHandlers)(wxXmlResource* self)=0D hunk ./wxc/src/eljrc.cpp 320 - ((wxXmlResource*)_obj)->InitAllHandlers();=0D - ((wxXmlResource*)_obj)->AddHandler(new wxMDIParentFrameXmlHandler());=0D - ((wxXmlResource*)_obj)->AddHandler(new wxMDIChildFrameXmlHandler());=0D - ((wxXmlResource*)_obj)->AddHandler(new wxSplitterWindowXmlHandler());=0D - ((wxXmlResource*)_obj)->AddHandler(new wxScintillaXmlHandler());=0D - ((wxXmlResource*)_obj)->AddHandler(new wxGridXmlHandler());=0D + self->InitAllHandlers();=0D + self->AddHandler(new wxMDIParentFrameXmlHandler());=0D + self->AddHandler(new wxMDIChildFrameXmlHandler());=0D + self->AddHandler(new wxSplitterWindowXmlHandler());=0D +#ifdef wxUSE_STC=0D + self->AddHandler(new wxStyledTextCtrlXmlHandler());=0D +#endif=0D + self->AddHandler(new wxGridXmlHandler());=0D hunk ./wxc/src/eljrc.cpp 330 -EWXWEXPORT(void,wxXmlResource_AddHandler)(void* _obj, void* handler)=0D +EWXWEXPORT(void,wxXmlResource_AddHandler)(wxXmlResource* self, wxXmlResour= ceHandler* handler)=0D hunk ./wxc/src/eljrc.cpp 332 - ((wxXmlResource*)_obj)->AddHandler((wxXmlResourceHandler*)handler);=0D + self->AddHandler(handler);=0D hunk ./wxc/src/eljrc.cpp 335 -EWXWEXPORT(void,wxXmlResource_InsertHandler)(void* _obj, void* handler)=0D +EWXWEXPORT(void,wxXmlResource_InsertHandler)(wxXmlResource* self, wxXmlRes= ourceHandler* handler)=0D hunk ./wxc/src/eljrc.cpp 337 - ((wxXmlResource*)_obj)->InsertHandler((wxXmlResourceHandler*)handler);=0D + self->InsertHandler(handler);=0D hunk ./wxc/src/eljrc.cpp 340 -EWXWEXPORT(void,wxXmlResource_ClearHandlers)(void* _obj)=0D +EWXWEXPORT(void,wxXmlResource_ClearHandlers)(wxXmlResource* self)=0D hunk ./wxc/src/eljrc.cpp 342 - ((wxXmlResource*)_obj)->ClearHandlers();=0D + self->ClearHandlers();=0D hunk ./wxc/src/eljrc.cpp 345 -EWXWEXPORT(void,wxXmlResource_AddSubclassFactory)(void* _obj, void* factor= y)=0D +EWXWEXPORT(void,wxXmlResource_AddSubclassFactory)(wxXmlResource* self, wxX= mlSubclassFactory* factory)=0D hunk ./wxc/src/eljrc.cpp 347 - ((wxXmlResource*)_obj)->AddSubclassFactory((wxXmlSubclassFactory*)factory= );=0D + self->AddSubclassFactory(factory);=0D hunk ./wxc/src/eljrc.cpp 350 -EWXWEXPORT(void*,wxXmlResource_LoadMenu)(void* _obj, void* name)=0D +EWXWEXPORT(wxMenu*,wxXmlResource_LoadMenu)(wxXmlResource* self, wxString* = name)=0D hunk ./wxc/src/eljrc.cpp 352 - return (void*)((wxXmlResource*)_obj)->LoadMenu((char*)name);=0D + return self->LoadMenu(*name);=0D hunk ./wxc/src/eljrc.cpp 355 -EWXWEXPORT(void*,wxXmlResource_LoadMenuBar)(void* _obj, void* parent, void= * name)=0D +EWXWEXPORT(wxMenuBar*,wxXmlResource_LoadMenuBar)(wxXmlResource* self, wxWi= ndow* parent, wxString* name)=0D hunk ./wxc/src/eljrc.cpp 357 - return (void*)((wxXmlResource*)_obj)->LoadMenuBar((wxWindow*)parent, (cha= r*)name);=0D + return self->LoadMenuBar(parent, *name);=0D hunk ./wxc/src/eljrc.cpp 360 -EWXWEXPORT(void*,wxXmlResource_LoadToolBar)(void* _obj, void* parent, void= * name)=0D +EWXWEXPORT(wxToolBar*,wxXmlResource_LoadToolBar)(wxXmlResource* self, wxWi= ndow* parent, wxString* name)=0D hunk ./wxc/src/eljrc.cpp 362 - return (void*)((wxXmlResource*)_obj)->LoadToolBar((wxWindow*)parent, (cha= r*)name);=0D + return self->LoadToolBar(parent, *name);=0D hunk ./wxc/src/eljrc.cpp 365 -EWXWEXPORT(void*,wxXmlResource_LoadDialog)(void* _obj, void* parent, void*= name)=0D +EWXWEXPORT(wxDialog*,wxXmlResource_LoadDialog)(wxXmlResource* self, wxWind= ow* parent, wxString* name)=0D hunk ./wxc/src/eljrc.cpp 367 - return (void*)((wxXmlResource*)_obj)->LoadDialog((wxWindow*)parent, (char= *)name);=0D + return self->LoadDialog(parent, *name);=0D hunk ./wxc/src/eljrc.cpp 370 -EWXWEXPORT(void*,wxXmlResource_LoadPanel)(void* _obj, void* parent, void* = name)=0D +EWXWEXPORT(wxPanel*,wxXmlResource_LoadPanel)(wxXmlResource* self, wxWindow= * parent, wxString* name)=0D hunk ./wxc/src/eljrc.cpp 372 - return (void*)((wxXmlResource*)_obj)->LoadPanel((wxWindow*)parent, (char*= )name);=0D + return self->LoadPanel(parent, *name);=0D hunk ./wxc/src/eljrc.cpp 375 -EWXWEXPORT(void*,wxXmlResource_LoadFrame)(void* _obj, void* parent, void* = name)=0D +EWXWEXPORT(wxFrame*,wxXmlResource_LoadFrame)(wxXmlResource* self, wxWindow= * parent, wxString* name)=0D hunk ./wxc/src/eljrc.cpp 377 - return (void*)((wxXmlResource*)_obj)->LoadFrame((wxWindow*)parent, (char*= )name);=0D + return self->LoadFrame(parent, *name);=0D hunk ./wxc/src/eljrc.cpp 380 -EWXWEXPORT(void*,wxXmlResource_LoadObject)(void* _obj, void* parent, void*= name, void* classname)=0D +EWXWEXPORT(wxObject*,wxXmlResource_LoadObject)(wxXmlResource* self, wxWind= ow* parent, wxString* name, wxString* classname)=0D hunk ./wxc/src/eljrc.cpp 382 - return (void*)((wxXmlResource*)_obj)->LoadObject((wxWindow*)parent, (char= *)name, (char*)classname);=0D + return self->LoadObject(parent, *name, *classname);=0D hunk ./wxc/src/eljrc.cpp 385 -EWXWEXPORT(int,wxXmlResource_InitializeObject)(void* _obj, void* _inst, vo= id* parent, void* name, void* classname)=0D +EWXWEXPORT(bool,wxXmlResource_InitializeObject)( wxXmlResource* self, wxOb= ject* _inst, wxWindow* parent,=0D + wxString* name, wxString*= classname)=0D hunk ./wxc/src/eljrc.cpp 388 - return (int)((wxXmlResource*)_obj)->LoadObject((wxObject*)_inst, (wxWindo= w*)parent, (char*)name, (char*)classname);=0D + return self->LoadObject(_inst, (wxWindow*)parent, *name, *classname);=0D hunk ./wxc/src/eljrc.cpp 391 -EWXWEXPORT(void,wxXmlResource_LoadBitmap)(void* _obj, void* name, void* _r= ef)=0D +EWXWEXPORT(void,wxXmlResource_LoadBitmap)(wxXmlResource* self, wxString* n= ame, void* _ref)=0D hunk ./wxc/src/eljrc.cpp 393 - *((wxBitmap*)_ref) =3D ((wxXmlResource*)_obj)->LoadBitmap((char*)name);= =0D + *((wxBitmap*)_ref) =3D self->LoadBitmap(*name);=0D hunk ./wxc/src/eljrc.cpp 396 -EWXWEXPORT(void,wxXmlResource_LoadIcon)(void* _obj, void* name, void* _ref= )=0D +EWXWEXPORT(void,wxXmlResource_LoadIcon)(wxXmlResource* self, wxString* nam= e, void* _ref)=0D hunk ./wxc/src/eljrc.cpp 398 - *((wxIcon*)_ref) =3D ((wxXmlResource*)_obj)->LoadIcon((char*)name);=0D + *((wxIcon*)_ref) =3D self->LoadIcon(*name);=0D hunk ./wxc/src/eljrc.cpp 401 -EWXWEXPORT(int,wxXmlResource_AttachUnknownControl)(void* _obj, void* name,= void* control, void* parent)=0D +EWXWEXPORT(bool,wxXmlResource_Unload)(wxXmlResource* self, wxString* name)= =0D hunk ./wxc/src/eljrc.cpp 403 - return (int)((wxXmlResource*)_obj)->AttachUnknownControl((char*)name, (wx= Window*)control, (wxWindow*)parent);=0D + return self->Unload(*name);=0D hunk ./wxc/src/eljrc.cpp 406 -EWXWEXPORT(int,wxXmlResource_GetXRCID)(void* str_id)=0D +EWXWEXPORT(bool,wxXmlResource_AttachUnknownControl)(wxXmlResource* self, w= xString* name, wxWindow* control, wxWindow* parent)=0D hunk ./wxc/src/eljrc.cpp 408 - return wxXmlResource::GetXRCID((wxChar*)str_id);=0D + return self->AttachUnknownControl(*name, control, parent);=0D hunk ./wxc/src/eljrc.cpp 411 -EWXWEXPORT(int,wxXmlResource_GetVersion)(void* _obj)=0D +EWXWEXPORT(int,wxXmlResource_GetXRCID)(wxXmlResource* self, wxChar* str_id= )=0D hunk ./wxc/src/eljrc.cpp 413 - return (int)((wxXmlResource*)_obj)->GetVersion();=0D + return self->GetXRCID(str_id);=0D hunk ./wxc/src/eljrc.cpp 416 -EWXWEXPORT(int,wxXmlResource_CompareVersion)(void* _obj, int major, int mi= nor, int release, int revision)=0D +EWXWEXPORT(long,wxXmlResource_GetVersion)(wxXmlResource* self)=0D hunk ./wxc/src/eljrc.cpp 418 - return ((wxXmlResource*)_obj)->CompareVersion(major, minor, release, revi= sion);=0D + return self->GetVersion();=0D hunk ./wxc/src/eljrc.cpp 421 -EWXWEXPORT(void*,wxXmlResource_Get)()=0D +EWXWEXPORT(int,wxXmlResource_CompareVersion)(wxXmlResource* self, int majo= r, int minor, int release, int revision)=0D hunk ./wxc/src/eljrc.cpp 423 - return (void*)wxXmlResource::Get();=0D + return self->CompareVersion(major, minor, release, revision);=0D hunk ./wxc/src/eljrc.cpp 426 -EWXWEXPORT(void*,wxXmlResource_Set)(void* res)=0D +EWXWEXPORT(wxXmlResource*,wxXmlResource_Get)(wxXmlResource* self)=0D hunk ./wxc/src/eljrc.cpp 428 - return (void*)wxXmlResource::Set((wxXmlResource*)res);=0D + return self->Get();=0D hunk ./wxc/src/eljrc.cpp 431 -EWXWEXPORT(int,wxXmlResource_GetFlags)(void* _obj)=0D +EWXWEXPORT(wxXmlResource*,wxXmlResource_Set)(wxXmlResource* self, wxXmlRes= ource* res)=0D +{=0D + return self->Set(res);=0D +}=0D +=0D +EWXWEXPORT(int,wxXmlResource_GetDomain)(wxXmlResource* self, wxChar* buf)= =0D hunk ./wxc/src/eljrc.cpp 438 - return ((wxXmlResource*)_obj)->GetFlags();=0D + buf =3D self->GetDomain();=0D + return wxStrlen(buf);=0D +}=0D +=0D +EWXWEXPORT(void,wxXmlResource_SetDomain)(wxXmlResource* self, wxChar* doma= in)=0D +{=0D + self->SetDomain(domain);=0D +}=0D +=0D +EWXWEXPORT(int,wxXmlResource_GetFlags)(wxXmlResource* self)=0D +{=0D + return self->GetFlags();=0D hunk ./wxc/src/eljrc.cpp 452 -EWXWEXPORT(void,wxXmlResource_SetFlags)(void* _obj, int flags)=0D +EWXWEXPORT(void,wxXmlResource_SetFlags)(wxXmlResource* self, int flags)=0D hunk ./wxc/src/eljrc.cpp 454 - ((wxXmlResource*)_obj)->SetFlags(flags);=0D + self->SetFlags(flags);=0D hunk ./wxc/src/eljrc.cpp 458 -#endif=0D hunk ./wxc/wxc-2.6.dsp 57 -# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp= at.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib= wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxm= sw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib wxmsw26u_svg.lib kernel3= 2.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.l= ib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpc= rt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /node= faultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /libpath:"..\.= .\wxWidgets-2.6.4\lib\vc_lib"=0D +# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp= at.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib= wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxm= sw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib wxmsw26u_svg.lib wxmsw26= u_xrc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advap= i32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib= comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /m= achine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dl= l" /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"=0D hunk ./wxc/wxc-2.6.dsp 88 -# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib = wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26= ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw2= 6ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib wxmsw26= ud_svg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib adva= pi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.li= b comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /= debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.7= -0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"=0D +# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib = wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26= ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw2= 6ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib wxmsw26= ud_svg.lib wxmsw26ud_xrc.lib kernel32.lib user32.lib gdi32.lib winspool.lib= comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc= 32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.= lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist= \wxc\wxcd-msw2.8.7-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.= 4\lib\vc_lib"=0D hunk ./wxc/wxc-2.8.dsp 57 -# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp= at.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib= wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxm= sw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib kernel3= 2.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.l= ib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comc= tl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machin= e:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /l= ibpath:"..\..\wxWidgets-2.8.7\lib\vc_lib"=0D +# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp= at.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib= wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxm= sw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib wxmsw28= u_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg= 32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib = odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /no= logo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8= .7-0.10.3.dll" /libpath:"..\..\wxWidgets-2.8.7\lib\vc_lib"=0D hunk ./wxc/wxc-2.8.dsp 88 -# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib = wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28= ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw2= 8ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28= ud_svg.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdl= g32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib= odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /n= ologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\w= xcd-msw2.8.7-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.8.7\lib\= vc_lib"=0D +# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib = wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28= ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw2= 8ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28= ud_svg.lib wxmsw28ud_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib = winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib u= uid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl3= 2.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /= out:"..\dist\wxc\wxcd-msw2.8.7-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wx= Widgets-2.8.7\lib\vc_lib"=0D hunk ./wxc/wxc-2.8.dsp 486 +# Begin Source File=0D +=0D +SOURCE=3D.\src\eljrc.cpp=0D +# End Source File=0D hunk ./wxdirect/src/DeriveTypes.hs 310 - -- xml resources - ,prefix "wxXmlResource" "xml resource" } [Fix: eljdcsvg.cpp doesn't build other than Windows. shelarcy <she...@gm...>**20080625095858] { hunk ./makefile 155 - dataformat datetime dc dialog dirdlg dnd drawing \ + dataformat datetime dc dcsvg dialog dirdlg dnd drawing \ } Context: [Use Int64 representing wxFileOffset type. shelarcy <she...@gm...>**20080624152015] = [Add dropped wxMedia's events to wxc. shelarcy <she...@gm...>**20080624140139] = [Add dropped wx*DCs. shelarcy <she...@gm...>**20080624122641] = [Update building information about --with-contrib option. shelarcy <she...@gm...>**20080624113243] = [Revive wxSVGFileDC code. shelarcy <she...@gm...>**20080624113214] = [Change --with-stc to --with-contrib for future contrib libraries support. shelarcy <she...@gm...>**20080624032429] = [Update information about builiding wxWidgets and wxc with Microsoft Visual= C++ Express Edition. shelarcy <she...@gm...>**20080624023628] = [Fix #1400488: Win install problem when path with spaces, e.g. "Program Fil= es". shelarcy <she...@gm...>**20080624020657] = [Partialy fix a bug in wxhaskell-register.bat. shelarcy <she...@gm...>**20080623152256] = [Add --enable-optimization opition for building library with optimization f= lags. shelarcy <she...@gm...>**20080531114050] = [Use CDouble and realToFrac instead of marshaling Double type directly. shelarcy <she...@gm...>**20080530024730] = [Remove unused make before-dist. shelarcy <she...@gm...>**20080529120234] = [Fix a bug in haddock documentation structure of Rectangle. shelarcy <she...@gm...>**20080529111415] = [Use putTraceMsg instead of hPutStrLn for Windows GUI-only program. shelarcy <she...@gm...>**20080526070627] = [Add very experimental wxGraphicsContext support. shelarcy <she...@gm...>**20080526063228] = [Change Point, Size, Vector and Rect to be type synonym for adding wxGraphi= csContext support. shelarcy <she...@gm...>**20080526055033] = [Fix: wxSound isn't managed object. shelarcy <she...@gm...>**20080524021436] = [Remove wxWidgets 2.4.x's wxWave code. shelarcy <she...@gm...>**20080430002921] = [Remove Wave type synonym. shelarcy <she...@gm...>**20080429233348] = [Change samples/contrib/PaintDirect to use withPixelBuffer instead of image= GetPixelBuffer. shelarcy <she...@gm...>**20080429232026] = [Change imageGetPixelArray and imageCreateFromPixelArray to be more flexibl= e. shelarcy <she...@gm...>**20080429183518] = [Fix: some samples don't run because of using undefined function since wxWi= dgets 2.8.x support. shelarcy <she...@gm...>**20080429145931] = [Add note about defaultButton's incompatible change since wxWidgets 2.8.x s= upport. shelarcy <she...@gm...>**20080429141545] = [Change Var type synonym from IORef to stm's TVar for thread safety. shelarcy <she...@gm...>**20080425114909] = [Fix: dists dropped two samples in samples/wx direcotory. shelarcy <she...@gm...>**20080425102416] = [Clean up wxWindows class's function declaration. shelarcy <she...@gm...>**20080425054152] = [Clean up #ifdef wxUSE_UNICODE flag by wxStrdup function. shelarcy <she...@gm...>**20080425051404] = [Replace _wcsdup with wxStrdup in wxWidgets 2.8 compat code. Eric Kow <eri...@gm...>**20080420115042 According to shelarcy and Jeremy, _wcsdup is Windows-specific. ] = [wxWidgets 2.8.7 on 0.10.3 release version jer...@gm...**20080410134132] = [TAG wxWidgets2.8.7_on_0.10.3rc1 jer...@gm...**20080410113256] = [Add TopLevelWindow for wxWidgets 2.8.7 support jer...@gm...**20080410113113] = [Preliminary wxWidgets 2.8.7 support jer...@gm...**20080410112559] = [Shifted to Pavel's Debian build system Mads Lindstroem <mad...@ya...>**20080413131752 = I have changed the current Debian build system to the one made by Pavel Shramov. It is a lot simpler than the current one. Also it is similar to what can normally be found in the Debian archieve, and I therefore assume that it will be easier to some day get an offecial WxHaskell Debian package. = All of the files in the debian directory is the work of Pavel. = I changed only one thing, as compared to Pavel's version. Namely that I removed the dependcy on libghc6-time-dev. I did it, as this dependency makes the package un-buildable on Debian unstable (GHC 6.8). At release 0.10.3, some users requested a GHC 6.8 version, and it is therefore important that we can provide one. = = ] = [Removed check for Data.Time Mads Lindstroem <mad...@ya...>**20080413114242 = Removed the check for Data.Time as it is not needed. I originally added it as I had somehow overlooked the Debian package libghc6-time-dev. Sorry about the unneccessary noise :( = ] = [Fix: samples/wx/makefile's "make clean" doesn't clean Windows things. shelarcy <she...@gm...>**20080409133446] = [Fix 1932640: samples/wx/FileBrowse is broken on Windows. = shelarcy <she...@gm...>**20080409132157] = [Add containers package dependency to wxcore.cabal. shelarcy <she...@gm...>**20080328131307] = [Remove IntMap from wxcore. Use the containers version instead. shelarcy <she...@gm...>**20080328131144] = [Add containers package to wxcore. shelarcy <she...@gm...>**20080328123744] = [Remove Set from wxdirect. Use the containers version instead. Eric Kow <eri...@gm...>**20080322140544] = [Remove Map from wxdirect. Use the containers version instead. Eric Kow <eri...@gm...>**20080322140245] = [Add containers package to wxdirect. Eric Kow <eri...@gm...>**20080322135933] = [Split makefile entry for wxdirect containers into separate lines. Eric Kow <eri...@gm...>**20080322135824 For more independence between patches which remove Map, Set and MultiSet in favour of the containers version. ] = [Use string comparison in haddockversion test. Eric Kow <eri...@gm...>**20080326224059 Again, for the case where haddock is not found. ] = [Fix bug in configure script if Haddock is not found. Eric Kow <eri...@gm...>**20080324155706 (discovered by S. Doaitse Swierstra) ] = [Add wx/license.txt to srcdist (to avoid build error). Eric Kow <eri...@gm...>**20080323125315] = [Fix download link typos. Eric Kow <eri...@gm...>**20080322130605] = [Kill a broken link (we no longer use CVS). Eric Kow <eri...@gm...>**20080322125822] = [Overwrite 0.10.3rc1 news with proper 0.10.3 news. Eric Kow <eri...@gm...>**20080322125032] = [TAG 0.10.3 Eric Kow <eri...@gm...>**20080321183613] = Patch bundle hash: 1f087584a094a2cb9a17915a60a2c81236d904ac --=_-- . |
From: Eric Y. K. <eri...@gm...> - 2008-06-25 22:25:58
|
Pushed! Thanks! I keep meaning to move towards a code.haskell.org repository -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9 |