From bd9822164214e03a2685b730fd6ac7072a2d167c Mon Sep 17 00:00:00 2001 From: "Zane U. Ji" Date: Wed, 14 Mar 2012 23:08:20 +0800 Subject: [PATCH] Fixed compiling problems --- .cproject | 235 +++++++++++++++++++++++++++++++++++++++ .project | 71 ++++++++++++ src/associatedialog.cpp | 6 +- src/findreplacepanel.cpp | 12 ++ src/housestyle.cpp | 1 + src/res/appicon.ico | Bin 0 -> 24358 bytes src/res/appicondoc.ico | Bin 0 -> 11502 bytes src/wrapaspell.cpp | 1 + src/wrapdaisy.cpp | 66 +++++++++-- src/xmlcopyeditor.cpp | 36 +++++- src/xmlcopyeditor.rc | 134 ++++++++++++++++++++++ src/xmlschemaparser.cpp | 1 + 12 files changed, 545 insertions(+), 18 deletions(-) create mode 100644 .cproject create mode 100644 .project create mode 100644 src/res/appicon.ico create mode 100644 src/res/appicondoc.ico create mode 100644 src/xmlcopyeditor.rc diff --git a/.cproject b/.cproject new file mode 100644 index 0000000..a7451b7 --- /dev/null +++ b/.cproject @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..383ef88 --- /dev/null +++ b/.project @@ -0,0 +1,71 @@ + + + XmlCopyEditor + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + ?name? + + + + org.eclipse.cdt.make.core.append_environment + true + + + org.eclipse.cdt.make.core.buildArguments + + + + org.eclipse.cdt.make.core.buildCommand + make + + + org.eclipse.cdt.make.core.buildLocation + ${workspace_loc:/XmlCopyEditor/Debug} + + + org.eclipse.cdt.make.core.contents + org.eclipse.cdt.make.core.activeConfigSettings + + + org.eclipse.cdt.make.core.enableAutoBuild + false + + + org.eclipse.cdt.make.core.enableCleanBuild + true + + + org.eclipse.cdt.make.core.enableFullBuild + true + + + org.eclipse.cdt.make.core.stopOnError + true + + + org.eclipse.cdt.make.core.useDefaultBuildCmd + true + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/src/associatedialog.cpp b/src/associatedialog.cpp index 213e87e..2338a84 100755 --- a/src/associatedialog.cpp +++ b/src/associatedialog.cpp @@ -171,8 +171,12 @@ void AssociateDialog::OnBrowse ( wxCommandEvent& e ) _T ( "" ), _T ( "" ), extensionArgument, +#if wxCHECK_VERSION(2,9,2) + wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR +#else wxOPEN | wxFILE_MUST_EXIST | wxCHANGE_DIR - ) ); +#endif + ) ); if ( fd->ShowModal() == wxID_OK ) { diff --git a/src/findreplacepanel.cpp b/src/findreplacepanel.cpp index 4decba3..718168f 100755 --- a/src/findreplacepanel.cpp +++ b/src/findreplacepanel.cpp @@ -158,7 +158,11 @@ void FindReplacePanel::OnReplace ( wxCommandEvent& event ) replaceEvent.SetFlags ( wxFR_DOWN ); replaceEvent.SetFindString ( findEdit->GetValue() ); replaceEvent.SetReplaceString ( replaceEdit->GetValue() ); +#if wxCHECK_VERSION(2,9,2) + parent->ProcessWindowEvent( replaceEvent ); +#else parent->ProcessEvent ( replaceEvent ); +#endif } void FindReplacePanel::OnReplaceAll ( wxCommandEvent& event ) @@ -167,7 +171,11 @@ void FindReplacePanel::OnReplaceAll ( wxCommandEvent& event ) replaceAllEvent.SetFlags ( wxFR_DOWN ); replaceAllEvent.SetFindString ( findEdit->GetValue() ); replaceAllEvent.SetReplaceString ( replaceEdit->GetValue() ); +#if wxCHECK_VERSION(2,9,2) + parent->ProcessWindowEvent( replaceAllEvent ); +#else parent->ProcessEvent ( replaceAllEvent ); +#endif } void FindReplacePanel::focusOnFind() @@ -214,7 +222,11 @@ void FindReplacePanel::sendFindEvent ( size_t flags ) MyFrame *frame = ( MyFrame * ) parent; frame->setStrictScrolling ( true ); +#if wxCHECK_VERSION(2,9,2) + frame->ProcessWindowEvent(findEvent); +#else frame->ProcessEvent ( findEvent ); // was parent-> +#endif frame->setStrictScrolling ( false ); findData->SetFindString ( findEdit->GetValue() ); diff --git a/src/housestyle.cpp b/src/housestyle.cpp index 6dce7b6..aa25904 100755 --- a/src/housestyle.cpp +++ b/src/housestyle.cpp @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include "housestyle.h" #include "readfile.h" diff --git a/src/res/appicon.ico b/src/res/appicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..be1d011ad2f4fcd12373e078461a4a2b7e6ea2cf GIT binary patch literal 24358 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 #include #include #include diff --git a/src/wrapdaisy.cpp b/src/wrapdaisy.cpp index c8c1147..262ee1e 100755 --- a/src/wrapdaisy.cpp +++ b/src/wrapdaisy.cpp @@ -110,7 +110,11 @@ bool WrapDaisy::run ( if ( !stdStylesheet.empty() ) // stylesheet found { // #1: convert to canonical XHTML - pd->ProcessPendingEvents(); +#if wxCHECK_VERSION(2,9,2) + pd->GetEventHandler()->ProcessPendingEvents(); +#else + pd->ProcessPendingEvents(); +#endif while (wxTheApp->Pending()) wxTheApp->Dispatch(); @@ -152,7 +156,11 @@ bool WrapDaisy::run ( if ( suppressOptional ) { - pd->ProcessPendingEvents(); +#if wxCHECK_VERSION(2,9,2) + pd->GetEventHandler()->ProcessPendingEvents(); +#else + pd->ProcessPendingEvents(); +#endif while (wxTheApp->Pending()) wxTheApp->Dispatch(); if ( !pd->Update ( 15, _("Suppressing optional production notes...") ) ) @@ -175,7 +183,11 @@ bool WrapDaisy::run ( if ( quiet ) { // #1.5: apply quiet setting if req'd - pd->ProcessPendingEvents(); +#if wxCHECK_VERSION(2,9,2) + pd->GetEventHandler()->ProcessPendingEvents(); +#else + pd->ProcessPendingEvents(); +#endif while (wxTheApp->Pending()) wxTheApp->Dispatch(); if ( !pd->Update ( 20, _("De-emphasizing production notes...") ) ) @@ -257,7 +269,11 @@ bool WrapDaisy::run ( } // copy images - pd->ProcessPendingEvents(); +#if wxCHECK_VERSION(2,9,2) + pd->GetEventHandler()->ProcessPendingEvents(); +#else + pd->ProcessPendingEvents(); +#endif while (wxTheApp->Pending()) wxTheApp->Dispatch(); @@ -292,7 +308,11 @@ bool WrapDaisy::run ( canonicalStream.close(); // #2: convert to DTBook - pd->ProcessPendingEvents(); +#if wxCHECK_VERSION(2,9,2) + pd->GetEventHandler()->ProcessPendingEvents(); +#else + pd->ProcessPendingEvents(); +#endif while (wxTheApp->Pending()) wxTheApp->Dispatch(); @@ -345,7 +365,11 @@ bool WrapDaisy::run ( return false; // #2.5: create ePub version - pd->ProcessPendingEvents(); +#if wxCHECK_VERSION(2,9,2) + pd->GetEventHandler()->ProcessPendingEvents(); +#else + pd->ProcessPendingEvents(); +#endif while (wxTheApp->Pending()) wxTheApp->Dispatch(); @@ -404,7 +428,11 @@ bool WrapDaisy::run ( // #2.9: convert to RTF if ( rtf || doc ) { - pd->ProcessPendingEvents(); +#if wxCHECK_VERSION(2,9,2) + pd->GetEventHandler()->ProcessPendingEvents(); +#else + pd->ProcessPendingEvents(); +#endif while (wxTheApp->Pending()) wxTheApp->Dispatch(); @@ -470,7 +498,11 @@ bool WrapDaisy::run ( // #2.9.5: convert to binary Word // (Win only; otherwise create copy with *.doc extension) - pd->ProcessPendingEvents(); +#if wxCHECK_VERSION(2,9,2) + pd->GetEventHandler()->ProcessPendingEvents(); +#else + pd->ProcessPendingEvents(); +#endif while (wxTheApp->Pending()) wxTheApp->Dispatch(); @@ -521,7 +553,11 @@ bool WrapDaisy::run ( } // #3: convert to full DAISY book - pd->ProcessPendingEvents(); +#if wxCHECK_VERSION(2,9,2) + pd->GetEventHandler()->ProcessPendingEvents(); +#else + pd->ProcessPendingEvents(); +#endif while (wxTheApp->Pending()) wxTheApp->Dispatch(); @@ -583,7 +619,11 @@ bool WrapDaisy::run ( return true; // #4: create MP3 album - pd->ProcessPendingEvents(); +#if wxCHECK_VERSION(2,9,2) + pd->GetEventHandler()->ProcessPendingEvents(); +#else + pd->ProcessPendingEvents(); +#endif while (wxTheApp->Pending()) wxTheApp->Dispatch(); @@ -660,7 +700,11 @@ bool WrapDaisy::run ( return false; - pd->ProcessPendingEvents(); +#if wxCHECK_VERSION(2,9,2) + pd->GetEventHandler()->ProcessPendingEvents(); +#else + pd->ProcessPendingEvents(); +#endif while (wxTheApp->Pending()) wxTheApp->Dispatch(); diff --git a/src/xmlcopyeditor.cpp b/src/xmlcopyeditor.cpp index 2c9274c..3b37e99 100755 --- a/src/xmlcopyeditor.cpp +++ b/src/xmlcopyeditor.cpp @@ -197,7 +197,7 @@ MyApp::MyApp() : checker ( NULL ), server ( NULL ), connection ( NULL ), int fdnull = open ( "/dev/null", O_WRONLY, 0 ); dup2 ( fdnull, STDERR_FILENO ); #endif - myLocale.Init(); + //myLocale.Init(); int systemLocale = myLocale.GetSystemLanguage(); switch ( systemLocale ) { @@ -338,7 +338,11 @@ bool MyApp::OnInit() wxString argument, what; wxChar *whatBuffer; what = _T ( "Data" ); +#if wxCHECK_VERSION(2,9,2) + whatBuffer = (wxChar *)what.wchar_str(); +#else whatBuffer = (wxChar *)what.c_str(); +#endif if ( this->argc > 1 ) { for ( int i = 1; i < this->argc; i++ ) @@ -2055,8 +2059,12 @@ void MyFrame::OnImportMSWord ( wxCommandEvent& event ) _T ( "" ), _T ( "" ), _T ( "Microsoft Word (*.doc)|*.doc" ), +#if wxCHECK_VERSION(2,9,2) + wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR +#else wxOPEN | wxFILE_MUST_EXIST | wxCHANGE_DIR - ) ); +#endif + ) ); if ( fd->ShowModal() == wxID_CANCEL ) return; @@ -2280,7 +2288,11 @@ void MyFrame::OnExportMSWord ( wxCommandEvent& event ) _T ( "" ), _T ( "" ), _T ( "Microsoft Word (*.doc)|*.doc" ), +#if wxCHECK_VERSION(2,9,2) + wxFD_SAVE | wxFD_OVERWRITE_PROMPT)); +#else wxSAVE | wxOVERWRITE_PROMPT ) ); +#endif fd->ShowModal(); wxString path = fd->GetPath(); @@ -2891,8 +2903,12 @@ void MyFrame::OnOpen ( wxCommandEvent& event ) defaultDir, wxEmptyString, FILE_FILTER, +#if wxCHECK_VERSION(2,9,2) + wxFD_OPEN | wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR +#else wxOPEN | wxMULTIPLE | wxFILE_MUST_EXIST | wxCHANGE_DIR - ); +#endif + ); if ( fd->ShowModal() == wxID_CANCEL ) @@ -3122,7 +3138,7 @@ bool MyFrame::openFile ( wxString& fileName, bool largeFile ) nconv = iconv ( cd, -#ifdef __WXMSW__ +#if defined(__WXMSW__) && !wxCHECK_VERSION(2,9,2) ( const char ** ) #endif &docBuffer, @@ -3517,7 +3533,11 @@ void MyFrame::saveAs() defaultDir, defaultFile, FILE_FILTER, +#if wxCHECK_VERSION(2,9,2) + wxFD_SAVE | wxFD_OVERWRITE_PROMPT ) ); +#else wxSAVE | wxOVERWRITE_PROMPT ) ); +#endif if ( fd->ShowModal() == wxID_CANCEL ) return; @@ -4737,7 +4757,7 @@ bool MyFrame::saveFile ( XmlDoc *doc, wxString& fileName, bool checkLastModified finalBuffer = iconvBuffer; // iconvBuffer will be incremented by iconv size_t nconv; -#ifdef __WXMSW__ +#if defined(__WXMSW__) && !wxCHECK_VERSION(2,9,2) const char * #else char * @@ -4748,7 +4768,7 @@ bool MyFrame::saveFile ( XmlDoc *doc, wxString& fileName, bool checkLastModified nconv = iconv ( cd, -#ifdef __WXMSW__ +#if defined(__WXMSW__) && !wxCHECK_VERSION(2,9,2) ( const char ** ) #endif &utf8BufferPtr, @@ -6141,7 +6161,11 @@ void MyFrame::OnActivateApp ( wxActivateEvent& event ) void MyFrame::OnIconize ( wxIconizeEvent& event ) { event.Skip(); +#if wxCHECK_VERSION(2,9,2) + if (event.IsIconized()) +#else if ( event.Iconized() ) +#endif return; restoreFocusToNotebook = true; } diff --git a/src/xmlcopyeditor.rc b/src/xmlcopyeditor.rc new file mode 100644 index 0000000..7faa55b --- /dev/null +++ b/src/xmlcopyeditor.rc @@ -0,0 +1,134 @@ +////////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 1 resource. +// + +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// + +#define APSTUDIO_READONLY_SYMBOLS +#define APSTUDIO_HIDDEN_SYMBOLS +#include +#undef APSTUDIO_HIDDEN_SYMBOLS + +#undef APSTUDIO_READONLY_SYMBOLS +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// +// Additional include files +// + + + +////////////////////////////////////////////////////////////////////////////// +// +// English (United States) resources +// + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +////////////////////////////////////////////////////////////////////////////// +// +// BITMAP : Bitmap +// + +stock_calc-accept BITMAP "png/stock_calc-accept.bmp" +stock_calc-accept-green BITMAP "png/stock_calc-accept-green.bmp" +stock_copy_16 BITMAP "png/stock_copy-16.bmp" +stock_cut_16 BITMAP "png/stock_cut-16.bmp" +stock_filters BITMAP "png/stock_filters.bmp" +stock_help_16 BITMAP "png/stock_help-16.bmp" +stock_hyperlink BITMAP "png/stock_hyperlink.bmp" +stock_internet BITMAP "png/stock_internet.bmp" +stock_internet_16 BITMAP "png/stock_internet-16.bmp" +stock_new BITMAP "png/stock_new.bmp" +stock_new_16 BITMAP "png/stock_new-16.bmp" +stock_open BITMAP "png/stock_open.bmp" +stock_open_16 BITMAP "png/stock_open-16.bmp" +stock_paste_16 BITMAP "png/stock_paste-16.bmp" +stock_print BITMAP "png/stock_print.bmp" +stock_print_16 BITMAP "png/stock_print-16.bmp" +stock_print_preview_16 BITMAP "png/stock_print-preview-16.bmp" +stock_redo_16 BITMAP "png/stock_redo-16.bmp" +stock_save BITMAP "png/stock_save.bmp" +stock_save_16 BITMAP "png/stock_save-16.bmp" +stock_search_16 BITMAP "png/stock_search-16.bmp" +stock_spellcheck BITMAP "png/stock_spellcheck.bmp" +stock_spellcheck_16 BITMAP "png/stock_spellcheck-16.bmp" +stock_undo_16 BITMAP "png/stock_undo-16.bmp" + +////////////////////////////////////////////////////////////////////////////// +// +// MENUEX : Menu +// + + +////////////////////////////////////////////////////////////////////////////// +// +// CURSOR : Cursor +// + + +////////////////////////////////////////////////////////////////////////////// +// +// ICON : Icon +// + +appicon ICON "res/appicon.ico" +appicondoc ICON "res/appicondoc.ico" + +#endif // English (United States) resources +////////////////////////////////////////////////////////////////////////////// +// +// RT_MANIFEST : Manifest +// +// Already taken care of by wxWidgets + +#ifdef APSTUDIO_INVOKED + +////////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "\0" +END + +2 TEXTINCLUDE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n", + "#include \r\n", + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" +END + +3 TEXTINCLUDE +BEGIN + "\0" +END + +#endif // APSTUDIO_INVOKED + + +////////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED +// +////////////////////////////////////////////////////////////////////////////// + diff --git a/src/xmlschemaparser.cpp b/src/xmlschemaparser.cpp index 5a63661..909133c 100755 --- a/src/xmlschemaparser.cpp +++ b/src/xmlschemaparser.cpp @@ -18,6 +18,7 @@ */ #include +#include #include #include #include