Added "set new icon" menu item to taskbar sample; updated some makefiles

[wxWidgets.git] / utils / HelpGen / src / HelpGen.cpp

diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp
index 97ee2dcf7a0558c0dbe35f9ea0acfee92b128174..dc7cd096c77b60e64f6ff54e12e5a2037734a7ea 100644 (file)
--- a/utils/HelpGen/src/HelpGen.cpp
+++ b/utils/HelpGen/src/HelpGen.cpp
@@ -436,10 +436,10 @@ private:
 static void usage()
 {
     wxString prog = g_argv[0];
 static void usage()
 {
     wxString prog = g_argv[0];

-    wxString basename = prog.BeforeLast('/');
+    wxString basename = prog.AfterLast('/');

 #ifdef __WXMSW__
     if ( !basename )
 #ifdef __WXMSW__
     if ( !basename )

-        basename = prog.BeforeLast('\\');
+        basename = prog.AfterLast('\\');

 #endif
     if ( !basename )
         basename = prog;
 #endif
     if ( !basename )
         basename = prog;


@@ -467,8 +467,9 @@ static void usage()
 "   mode specific options are:\n"
 "       -p          do check parameter names (not done by default)\n"
 "\n", basename.c_str(), basename.c_str());
 "   mode specific options are:\n"
 "       -p          do check parameter names (not done by default)\n"
 "\n", basename.c_str(), basename.c_str());

-
+#ifndef wxUSE_GUI

     exit(1);
     exit(1);

+#endif

 }
 
 /*
 }
 
 /*


@@ -788,7 +789,7 @@ void HelpGenVisitor::VisitClass( spClass& cl )
 
     // the file name is built from the class name by removing the leading "wx"
     // if any and converting it to the lower case
 
     // the file name is built from the class name by removing the leading "wx"
     // if any and converting it to the lower case

-    wxString filename = m_directoryOut;
+    wxString filename;

     if ( name(0, 2) == "wx" ) {
         filename << name.c_str() + 2;
     }
     if ( name(0, 2) == "wx" ) {
         filename << name.c_str() + 2;
     }


@@ -798,6 +799,7 @@ void HelpGenVisitor::VisitClass( spClass& cl )
 
     filename.MakeLower();
     filename += ".tex";
 
     filename.MakeLower();
     filename += ".tex";

+    filename.Prepend(m_directoryOut);

 
     if ( !m_overwrite && wxFile::Exists(filename) ) {
         wxLogError("Won't overwrite existing file '%s' - please use '-f'.",
 
     if ( !m_overwrite && wxFile::Exists(filename) ) {
         wxLogError("Won't overwrite existing file '%s' - please use '-f'.",


@@ -1938,6 +1940,15 @@ static const char *GetCurrentTime(const char *timeFormat)
 
 /*
    $Log$
 
 /*
    $Log$

+   Revision 1.12  2000/10/09 13:53:33  juliansmart
+   Doc corrections; added HelpGen project files
+
+   Revision 1.11  2000/07/15 19:50:42  cvsuser
+   merged 2.2 branch
+
+   Revision 1.10.2.2  2000/03/27 15:33:10  VZ
+   don't trasnform output dir name to lower case
+

    Revision 1.10  2000/03/11 10:05:23  VS
    now compiles with wxBase
 
    Revision 1.10  2000/03/11 10:05:23  VS
    now compiles with wxBase