From 03a90749df32e712f6f0c7a0de7bb1f1b1380b95 Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Tue, 13 Jan 2004 02:02:54 +0000 Subject: [PATCH] Applied patch #875647, fixes an unused variable warning reported by Borland; Some minor changes such as tab removal, TRUE/FALSE->true/false. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/helpview/src/helpview.cpp | 443 ++++++++++++++++---------------- 1 file changed, 225 insertions(+), 218 deletions(-) diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp index e288092dcb..14e98cf8dc 100644 --- a/utils/helpview/src/helpview.cpp +++ b/utils/helpview/src/helpview.cpp @@ -58,32 +58,32 @@ bool hvApp::OnInit() #ifdef __WXMOTIF__ delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used #endif - + wxArtProvider::PushProvider(new AlternateArtProvider); - + #ifdef __WXMAC__ wxApp::s_macAboutMenuItemId = wxID_ABOUT; wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ; #endif int istyle = wxHF_DEFAULT_STYLE; - + wxString service, windowName, book[10], titleFormat, argStr; int bookCount = 0; int i; - bool hasService = FALSE; - bool hasWindowName = FALSE; - bool createServer = FALSE; - + bool hasService = false; + bool hasWindowName = false; + bool createServer = false; + #if hvUSE_IPC m_server = NULL; #endif - + // Help books are recognized by extension ".hhp" ".htb" or ".zip". // Service and window_name can occur anywhere in arguments, // but service must be first // Other arguments (topic?) could be added - + // modes of operation: // 1) no arguments - stand alone, prompt user for book // 2) books only - stand alone, open books @@ -92,132 +92,137 @@ bool hvApp::OnInit() // 4) at least one argument which is not book, and not "--server" - take first // such argument as service, second (if present) as window name, // start service, open any books - - for( i=1; i < argc; i++ ) + + for( i=1; i= 0 || - argStr.Find( wxT(".htb") ) >= 0 || - argStr.Find( wxT(".zip") ) >= 0 ) { - book[bookCount] = argStr; - bookCount++; - } - else if ( argStr == wxT("--server") ) - { - createServer = TRUE; + argStr = argv[i]; + + if ( argStr.Find( wxT(".hhp") ) >= 0 + || argStr.Find( wxT(".htb") ) >= 0 + || argStr.Find( wxT(".zip") ) >= 0 ) + { + book[bookCount] = argStr; + bookCount++; + } + else if ( argStr == wxT("--server") ) + { + createServer = true; #if defined(__WXMSW__) - service = wxT("generic_helpservice"); + service = wxT("generic_helpservice"); #elif defined(__UNIX__) - service = wxT("/tmp/") + wxString(wxT("generic_helpservice")); + service = wxT("/tmp/") + wxString(wxT("generic_helpservice")); #else - service = wxT("4242"); + service = wxT("4242"); #endif - } - else if ( !hasService ) - { - service = argStr; - hasService = TRUE; - createServer = TRUE; - } - else if ( !hasWindowName ) - { - windowName = argStr; - hasWindowName = TRUE; - } - else if ( argStr.Find( wxT("--Style") ) >= 0 ) - { - long i; - wxString numb = argStr.AfterLast(wxT('e')); - if ( !(numb.ToLong(&i) ) ) - { - wxLogError( wxT("Integer conversion failed for --Style") ); - } - else - { - istyle = i; - } - } - else - { - //unknown - could be topic? - } + } + else if ( !hasService ) + { + service = argStr; + hasService = true; + createServer = true; + } + else if ( !hasWindowName ) + { + windowName = argStr; + hasWindowName = true; + } + else if ( argStr.Find( wxT("--Style") ) >= 0 ) + { + long i; + wxString numb = argStr.AfterLast(wxT('e')); + if ( !(numb.ToLong(&i) ) ) + { + wxLogError( wxT("Integer conversion failed for --Style") ); + } + else + { + istyle = i; + } + } + else + { + //unknown - could be topic? + } } - + // No book - query user; but not on Mac, since there // may be an AppleEvent to open a document on the way #ifndef __WXMAC__ if ( bookCount < 1 ) { - wxString s = wxFileSelector( wxT("Open help file"), - wxGetCwd(), - wxEmptyString, - wxEmptyString, - wxT("Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp"), - wxOPEN | wxFILE_MUST_EXIST, - NULL); - - if (!s.IsEmpty()) - { - book[0] = s; - bookCount = 1; - } - } + wxString s = wxFileSelector( wxT("Open help file"), + wxGetCwd(), + wxEmptyString, + wxEmptyString, + wxT("Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp"), + wxOPEN | wxFILE_MUST_EXIST, + NULL); + + if (!s.IsEmpty()) + { + book[0] = s; + bookCount = 1; + } + } #endif - + #if hvUSE_IPC - - if ( createServer ) { - // Create a new server - m_server = new hvServer; - - if ( !m_server->Create(service) ) { - wxString wxm = wxT("Server Create failed - service: "); - wxString xxm = wxm << service; - wxLogError( xxm ); - //if MSW quits here, probably another copy already exists - return FALSE; - - } - createServer = FALSE; + + if ( createServer ) + { + // Create a new server + m_server = new hvServer; + + if ( !m_server->Create(service) ) + { + wxString wxm = wxT("Server Create failed - service: "); + wxString xxm = wxm << service; + wxLogError( xxm ); + //if MSW quits here, probably another copy already exists + return false; + } + createServer = false; + wxUnusedVar(createServer); } - + #endif // hvUSE_IPC - + //now add help wxInitAllImageHandlers(); - wxFileSystem::AddHandler(new wxZipFSHandler); - + wxFileSystem::AddHandler(new wxZipFSHandler); + SetVendorName(wxT("wxWindows") ); - SetAppName(wxT("wxHTMLHelpServer") ); + SetAppName(wxT("wxHTMLHelpServer") ); wxConfig::Get(); // create an instance - + m_helpController = new wxHtmlHelpController( istyle ); - + if ( !hasWindowName ) + { titleFormat = wxT("Help: %s") ; + } else { - //remove underscores - windowName.Replace( wxT("_"), wxT(" ") ); - titleFormat = windowName; + //remove underscores + windowName.Replace( wxT("_"), wxT(" ") ); + titleFormat = windowName; } - + m_helpController->SetTitleFormat( titleFormat ); - - for( i=0; i < bookCount; i++ ) + + for( i=0; iAddBook(fileName); + m_helpController->AddBook(fileName); } - + #ifdef __WXMOTIF__ delete wxLog::SetActiveTarget(new wxLogGui); #endif - - m_helpController -> DisplayContents(); - - return TRUE; + + m_helpController->DisplayContents(); + + return true; } @@ -234,17 +239,17 @@ int hvApp::OnExit() node = next; } m_connections.Clear(); - + if (m_server) { delete m_server; m_server = NULL; } #endif - + delete m_helpController; delete wxConfig::Set(NULL); - + return 0; } @@ -255,12 +260,12 @@ bool hvApp::OpenBook(wxHtmlHelpController* controller) wxEmptyString, wxEmptyString, _( - "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|\ - HTML Help Project (*.hhp)|*.hhp"), - wxOPEN | wxFILE_MUST_EXIST, - NULL); - - if (!s.IsEmpty()) + "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|\ + HTML Help Project (*.hhp)|*.hhp"), + wxOPEN | wxFILE_MUST_EXIST, + NULL); + + if ( !s.empty() ) { wxString ext = s.Right(4).Lower(); if (ext == _T(".zip") || ext == _T(".htb") || ext == _T(".hhp")) @@ -268,10 +273,11 @@ bool hvApp::OpenBook(wxHtmlHelpController* controller) wxBusyCursor bcur; wxFileName fileName(s); controller->AddBook(fileName); - return TRUE; + return true; } } - return FALSE; + + return false; } #ifdef __WXMAC__ @@ -301,14 +307,14 @@ if ( id == artId ) return wxBitmap(xpmRc##_xpm); // Compatibility hack to use wxApp::GetStdIcon of overriden by the user #if WXWIN_COMPATIBILITY_2_2 #define GET_STD_ICON_FROM_APP(iconId) \ - if ( client == wxART_MESSAGE_BOX ) \ + if ( client == wxART_MESSAGE_BOX ) \ { \ - wxIcon icon = wxTheApp->GetStdIcon(iconId); \ - if ( icon.Ok() ) \ + wxIcon icon = wxTheApp->GetStdIcon(iconId); \ + if ( icon.Ok() ) \ { \ - wxBitmap bmp; \ - bmp.CopyFromIcon(icon); \ - return bmp; \ + wxBitmap bmp; \ + bmp.CopyFromIcon(icon); \ + return bmp; \ } \ } #else @@ -324,10 +330,10 @@ if ( id == artId ) return wxBitmap(xpmRc##_xpm); #else #define CREATE_STD_ICON(iconId, xpmRc) \ { \ - wxIcon icon(_T(iconId)); \ - wxBitmap bmp; \ - bmp.CopyFromIcon(icon); \ - return bmp; \ + wxIcon icon(_T(iconId)); \ + wxBitmap bmp; \ + bmp.CopyFromIcon(icon); \ + return bmp; \ } #endif @@ -335,8 +341,8 @@ if ( id == artId ) return wxBitmap(xpmRc##_xpm); #define ART_MSGBOX(artId, iconId, xpmRc) \ if ( id == artId ) \ { \ - GET_STD_ICON_FROM_APP(iconId) \ - CREATE_STD_ICON(#iconId, xpmRc) \ + GET_STD_ICON_FROM_APP(iconId) \ + CREATE_STD_ICON(#iconId, xpmRc) \ } // --------------------------------------------------------------------- @@ -369,29 +375,29 @@ wxBitmap AlternateArtProvider::CreateBitmap(const wxArtID& id, const wxSize& WXUNUSED(size)) { ART(wxART_HELP_SIDE_PANEL, helpsidepanel) - ART(wxART_HELP_SETTINGS, helpoptions) - ART(wxART_HELP_BOOK, helpbook) - ART(wxART_HELP_FOLDER, helpbook) - ART(wxART_HELP_PAGE, helppage) - //ART(wxART_ADD_BOOKMARK, addbookm) - //ART(wxART_DEL_BOOKMARK, delbookm) - ART(wxART_GO_BACK, helpback) - ART(wxART_GO_FORWARD, helpforward) - ART(wxART_GO_UP, helpup) - ART(wxART_GO_DOWN, helpdown) - ART(wxART_GO_TO_PARENT, helpuplevel) - ART(wxART_FILE_OPEN, helpopen) - if (client == wxART_HELP_BROWSER) - { - //ART(wxART_FRAME_ICON, helpicon) - ART(wxART_HELP, helpicon) - } - - //ART(wxART_GO_HOME, home) - - // Any wxWindows icons not implemented here - // will be provided by the default art provider. - return wxNullBitmap; + ART(wxART_HELP_SETTINGS, helpoptions) + ART(wxART_HELP_BOOK, helpbook) + ART(wxART_HELP_FOLDER, helpbook) + ART(wxART_HELP_PAGE, helppage) + //ART(wxART_ADD_BOOKMARK, addbookm) + //ART(wxART_DEL_BOOKMARK, delbookm) + ART(wxART_GO_BACK, helpback) + ART(wxART_GO_FORWARD, helpforward) + ART(wxART_GO_UP, helpup) + ART(wxART_GO_DOWN, helpdown) + ART(wxART_GO_TO_PARENT, helpuplevel) + ART(wxART_FILE_OPEN, helpopen) + if (client == wxART_HELP_BROWSER) + { + //ART(wxART_FRAME_ICON, helpicon) + ART(wxART_HELP, helpicon) + } + + //ART(wxART_GO_HOME, home) + + // Any wxWindows icons not implemented here + // will be provided by the default art provider. + return wxNullBitmap; } #if hvUSE_IPC @@ -424,26 +430,28 @@ bool hvConnection::OnExecute(const wxString& WXUNUSED(topic), int WXUNUSED(size), wxIPCFormat WXUNUSED(format)) { - // wxLogStatus("Execute command: %s", data); - - if ( !wxStrncmp( data, wxT("--intstring"), 11 ) ) - { + // wxLogStatus("Execute command: %s", data); + + if ( !wxStrncmp( data, wxT("--intstring"), 11 ) ) + { long i; - wxString argStr = data; - wxString numb = argStr.AfterLast(wxT('g')); - if ( !(numb.ToLong(&i) ) ) { - wxLogError( wxT("Integer conversion failed for --intstring") ); - } - else { - wxGetApp().GetHelpController()->Display(int(i)); - } - } - else - { - wxGetApp().GetHelpController()->Display(data); - } - - return TRUE; + wxString argStr = data; + wxString numb = argStr.AfterLast(wxT('g')); + if ( !(numb.ToLong(&i) ) ) + { + wxLogError( wxT("Integer conversion failed for --intstring") ); + } + else + { + wxGetApp().GetHelpController()->Display(int(i)); + } + } + else + { + wxGetApp().GetHelpController()->Display(data); + } + + return true; } bool hvConnection::OnPoke(const wxString& WXUNUSED(topic), @@ -452,56 +460,56 @@ bool hvConnection::OnPoke(const wxString& WXUNUSED(topic), int WXUNUSED(size), wxIPCFormat WXUNUSED(format)) { - // wxLogStatus("Poke command: %s = %s", item.c_str(), data); - //topic is not tested - - if ( wxGetApp().GetHelpController() ) - { - if ( item == wxT("--AddBook") ) - { - wxGetApp().GetHelpController()->AddBook(data); - } - else if ( item == wxT("--DisplayContents") ) - { - wxGetApp().GetHelpController()->DisplayContents(); - } - else if ( item == wxT("--DisplayIndex") ) - { - wxGetApp().GetHelpController()->DisplayIndex(); - } - else if ( item == wxT("--KeywordSearch") ) - { - wxGetApp().GetHelpController()->KeywordSearch(data); - } - else if ( item == wxT("--SetTitleFormat") ) - { - wxString newname = data; - newname.Replace( wxT("_"), wxT(" ") ); - wxGetApp().GetHelpController()->SetTitleFormat(newname); - //does not redraw title bar? - //wxGetApp().GetHelpController()->ReFresh(); - or something - } - else if ( item == wxT("--SetTempDir") ) - { - wxGetApp().GetHelpController()->SetTempDir(data); - } - else if ( item == wxT("--YouAreDead") ) - { - // don't really know how to kill app from down here... - // use wxKill from client instead - //wxWindow *win = wxTheApp->GetTopWindow(); - //if ( win ) - // win->Destroy(); - } - } - - return TRUE; + // wxLogStatus("Poke command: %s = %s", item.c_str(), data); + //topic is not tested + + if ( wxGetApp().GetHelpController() ) + { + if ( item == wxT("--AddBook") ) + { + wxGetApp().GetHelpController()->AddBook(data); + } + else if ( item == wxT("--DisplayContents") ) + { + wxGetApp().GetHelpController()->DisplayContents(); + } + else if ( item == wxT("--DisplayIndex") ) + { + wxGetApp().GetHelpController()->DisplayIndex(); + } + else if ( item == wxT("--KeywordSearch") ) + { + wxGetApp().GetHelpController()->KeywordSearch(data); + } + else if ( item == wxT("--SetTitleFormat") ) + { + wxString newname = data; + newname.Replace( wxT("_"), wxT(" ") ); + wxGetApp().GetHelpController()->SetTitleFormat(newname); + //does not redraw title bar? + //wxGetApp().GetHelpController()->ReFresh(); - or something + } + else if ( item == wxT("--SetTempDir") ) + { + wxGetApp().GetHelpController()->SetTempDir(data); + } + else if ( item == wxT("--YouAreDead") ) + { + // don't really know how to kill app from down here... + // use wxKill from client instead + //wxWindow *win = wxTheApp->GetTopWindow(); + //if ( win ) + // win->Destroy(); + } + } + + return true; } wxChar *hvConnection::OnRequest(const wxString& WXUNUSED(topic), - const wxString& WXUNUSED(item), - int * WXUNUSED(size), - wxIPCFormat WXUNUSED(format)) + const wxString& WXUNUSED(item), + int * WXUNUSED(size), + wxIPCFormat WXUNUSED(format)) { return NULL; } @@ -509,8 +517,7 @@ wxChar *hvConnection::OnRequest(const wxString& WXUNUSED(topic), bool hvConnection::OnStartAdvise(const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item)) { - return TRUE; + return true; } -#endif - // hvUSE_IPC +#endif // #if hvUSE_IPC -- 2.45.2