Minor doc typos removed; compilation improved for VC++ 4.x

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 01908fbde50f344aa97c4bd073e1357d9de53e8d..42fbb6b6c9b4105073baae233f3d9d365d526819 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -152,25 +152,8 @@ misc/gs_afm/*.afm
 
 utils/*.txt
 utils/make*
 
 utils/*.txt
 utils/make*

-
-utils/xpmshow/src/makefile*
-utils/xpmshow/src/*.cpp
-utils/xpmshow/src/*.h
-utils/xpmshow/src/*.def
-utils/xpmshow/src/*.rc
-utils/xpmshow/src/*.xpm
-utils/xpmshow/src/*.bmp
-utils/xpmshow/src/*.ico
-
-utils/wxhelp/src/*.cpp
-utils/wxhelp/src/*.h
-utils/wxhelp/src/makefile*
-utils/wxhelp/src/*.xbm
-utils/wxhelp/src/*.xpm
-utils/wxhelp/src/*.txt
-utils/wxhelp/src/*.ico
-utils/wxhelp/src/*.def
-utils/wxhelp/src/*.rc
+utils/configure
+utils/configure.in

 
 utils/wxgraph/src/*.cpp
 utils/wxgraph/src/*.c
 
 utils/wxgraph/src/*.cpp
 utils/wxgraph/src/*.c


@@ -213,6 +196,25 @@ utils/serialize/*.xbm
 utils/serialize/*.xpm
 utils/serialize/*.txt
 
 utils/serialize/*.xpm
 utils/serialize/*.txt
 

+utils/hhp2cache/*.h
+utils/hhp2cache/*.cpp
+utils/hhp2cache/*.def
+utils/hhp2cache/*.rc
+utils/hhp2cache/makefile*
+utils/hhp2cache/*.xbm
+utils/hhp2cache/*.xpm
+utils/hhp2cache/*.txt
+
+utils/makegen/*.h
+utils/makegen/*.cpp
+utils/makegen/*.def
+utils/makegen/*.rc
+utils/makegen/makefile*
+utils/makegen/*.xbm
+utils/makegen/*.xpm
+utils/makegen/*.txt
+utils/makegen/templates/make*
+

 utils/dialoged/Makefile
 utils/dialoged/src/bitmaps/*.xbm
 utils/dialoged/src/bitmaps/*.xpm
 utils/dialoged/Makefile
 utils/dialoged/src/bitmaps/*.xbm
 utils/dialoged/src/bitmaps/*.xpm


@@ -256,6 +258,8 @@ utils/wxMMedia2/sample/*.txt
 
 samples/*.txt
 samples/makefile*
 
 samples/*.txt
 samples/makefile*

+samples/configure
+samples/configure.in

 
 samples/config/*.cpp
 samples/config/*.h
 
 samples/config/*.cpp
 samples/config/*.h


@@ -1003,6 +1007,10 @@ samples/exec/*.ico
 samples/exec/*.xpm
 samples/exec/*.txt
 
 samples/exec/*.xpm
 samples/exec/*.txt
 

+samples/makefile*
+samples/configure
+samples/configure.in
+

 demos/bombs/*.cpp
 demos/bombs/*.h
 demos/bombs/*.def
 demos/bombs/*.cpp
 demos/bombs/*.h
 demos/bombs/*.def


@@ -1059,3 +1067,36 @@ demos/poem/*.ico
 demos/poem/*.bmp
 demos/poem/*.dat
 
 demos/poem/*.bmp
 demos/poem/*.dat
 

+demos/dbbrowse/*.cpp
+demos/dbbrowse/*.h
+demos/dbbrowse/*.def
+demos/dbbrowse/*.rc
+demos/dbbrowse/*.inf
+demos/dbbrowse/*.txt
+demos/dbbrowse/makefile*
+demos/dbbrowse/*.xbm
+demos/dbbrowse/*.xpm
+demos/dbbrowse/*.ico
+demos/dbbrowse/*.bmp
+demos/dbbrowse/bitmaps/*.bmp
+demos/dbbrowse/bitmaps/*.ico
+demos/dbbrowse/bitmaps/*.xpm
+demos/dbbrowse/de/*.po
+demos/dbbrowse/de/*.mo
+demos/dbbrowse/de/*.cmd
+demos/dbbrowse/de/*.cfg
+demos/dbbrowse/fr/*.po
+demos/dbbrowse/fr/*.mo
+demos/dbbrowse/fr/*.cmd
+demos/dbbrowse/fr/*.cfg
+demos/dbbrowse/help.cz/*.mo
+demos/dbbrowse/help.de/*.htm
+demos/dbbrowse/help.de/*.hhc
+demos/dbbrowse/help.de/*.hhp
+demos/dbbrowse/help.de/*.hhk
+demos/dbbrowse/help.png/*.png
+demos/dbbrowse/help.std/*.htm
+demos/dbbrowse/help.std/*.hhc
+demos/dbbrowse/help.std/*.hhp
+demos/dbbrowse/help.std/*.hhk
+

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 1f153cddef0991723e9fa860cb0322d62c2dd0a0..e19bae016489a4758402f36d2d1517a6478f060f 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -260,7 +260,7 @@ Under MS Windows, the current drive is also changed if {\it dir} contains a driv
 
 \membersection{::wxSplitPath}\label{wxsplitfunction}
 
 
 \membersection{::wxSplitPath}\label{wxsplitfunction}
 

-\func{void}{wxSplitPath}{\param{const char *}{ fullname}, \param{const wxString *}{ path}, \param{const wxString *}{ name}, \param{const wxString *}{ ext}}
+\func{void}{wxSplitPath}{\param{const char *}{ fullname}, \param{wxString *}{ path}, \param{wxString *}{ name}, \param{wxString *}{ ext}}

 
 This function splits a full file name into components: the path (including possible disk/drive
 specification under Windows), the base name and the extension. Any of the output parameters
 
 This function splits a full file name into components: the path (including possible disk/drive
 specification under Windows), the base name and the extension. Any of the output parameters

diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index b3dbcca606f5a964a10f4d04e3006169d9bc7356..d1f4b13facf91d16832a91f4e2ca3e8837cf2b7f 100644 (file)
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -2295,10 +2295,6 @@ Sets the window's title. Applicable only to frames and dialogs.
 Deletes the current validator (if any) and sets the window validator, having called wxValidator::Clone to
 create a new validator of this type.
 
 Deletes the current validator (if any) and sets the window validator, having called wxValidator::Clone to
 create a new validator of this type.
 

-\membersection{wxWindow::SetWindowStyleFlag}\label{wxwindowsetwindowstyleflag}
-
-\func{virtual void}{SetWindowStyleFlag}{\param{long}{ style}}
-

 \membersection{wxWindow::SetWindowStyle}\label{wxwindowsetwindowstyle}
 
 \func{void}{SetWindowStyle}{\param{long}{ style}}
 \membersection{wxWindow::SetWindowStyle}\label{wxwindowsetwindowstyle}
 
 \func{void}{SetWindowStyle}{\param{long}{ style}}

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index f670fc00ad735c872d589237b79e07737bb578e8..6a0ce41c81e1b5ee4d3e74e7788ac897df9f3905 100644 (file)
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -269,11 +269,11 @@ bool RegApp::OnInit()
 {
   // create the main frame window and show it
   RegFrame *frame = new RegFrame(NULL, "wxRegKey Test", 50, 50, 600, 350);
 {
   // create the main frame window and show it
   RegFrame *frame = new RegFrame(NULL, "wxRegKey Test", 50, 50, 600, 350);

-  frame->Show(true);
+  frame->Show(TRUE);

   
   SetTopWindow(frame);
 
   
   SetTopWindow(frame);
 

-  return true;
+  return TRUE;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -589,7 +589,7 @@ bool RegTreeCtrl::TreeNode::OnExpand()
   if ( IsRoot() ) {
     // we're the root key
     m_pTree->AddStdKeys();
   if ( IsRoot() ) {
     // we're the root key
     m_pTree->AddStdKeys();

-    return true;
+    return TRUE;

   }
 
   if ( Parent()->IsRoot() ) {
   }
 
   if ( Parent()->IsRoot() ) {


@@ -603,7 +603,7 @@ bool RegTreeCtrl::TreeNode::OnExpand()
 
   if ( !m_pKey->Open() ) {
     wxLogError("The key '%s' can't be opened.", FullName());
 
   if ( !m_pKey->Open() ) {
     wxLogError("The key '%s' can't be opened.", FullName());

-    return false;
+    return FALSE;

   }
 
   // enumeration variables
   }
 
   // enumeration variables


@@ -666,7 +666,7 @@ bool RegTreeCtrl::TreeNode::OnExpand()
     bCont = m_pKey->GetNextValue(str, l);
   }
 
     bCont = m_pKey->GetNextValue(str, l);
   }
 

-  return true;
+  return TRUE;

 }
 
 void RegTreeCtrl::TreeNode::OnCollapse()
 }
 
 void RegTreeCtrl::TreeNode::OnCollapse()


@@ -834,7 +834,7 @@ bool RegTreeCtrl::IsKeySelected() const
   long lCurrent = GetSelection();
   TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
   long lCurrent = GetSelection();
   TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 

-  wxCHECK( pCurrent != NULL, false );
+  wxCHECK( pCurrent != NULL, FALSE );

 
   return pCurrent->IsKey();
 }
\ No newline at end of file
 
   return pCurrent->IsKey();
 }
\ No newline at end of file

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 74a7200000d814d03282d43487a8187a550ebf1d..98c06585364dd32265cdccfb4d8155fd6fca24b8 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -103,12 +103,12 @@ BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
 END_EVENT_TABLE()
 
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
 END_EVENT_TABLE()
 

-void MyTaskBarIcon::OnMenuRestore(wxEvent& )
+void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )

 {
     dialog->Show(TRUE);
 }
 
 {
     dialog->Show(TRUE);
 }
 

-void MyTaskBarIcon::OnMenuExit(wxEvent& )
+void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )

 {
     dialog->Close(TRUE);
 }
 {
     dialog->Close(TRUE);
 }

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index 142ce5d237fe6ccb2df88cf5a098033a616acb96..b25defd7130fb36641639fc4d87b88b62d7811e5 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -22,8 +22,8 @@ public:
     virtual void OnLButtonDClick(wxEvent&);
     virtual void OnRButtonDClick(wxEvent&);
 
     virtual void OnLButtonDClick(wxEvent&);
     virtual void OnRButtonDClick(wxEvent&);
 

-    void OnMenuRestore(wxEvent&);
-    void OnMenuExit(wxEvent&);
+    void OnMenuRestore(wxCommandEvent&);
+    void OnMenuExit(wxCommandEvent&);

 
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };

diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp
index 748ac446be301f37324c470c99c1087619b3e2e2..fa31ef45b65d6da6a4f4c014897f362796605e67 100644 (file)
--- a/utils/projgen/makeproj.cpp
+++ b/utils/projgen/makeproj.cpp
@@ -391,6 +391,24 @@ void MyApp::GenerateSamples(const wxString& dir)
         wxMessageBox(msg);
     }
 
         wxMessageBox(msg);
     }
 

+    // hhp2cached
+    project.SetIncludeDirs(wxStringList("../../include", 0));
+    project.SetResourceIncludeDirs(wxStringList("../../include", 0));
+    project.SetLibDirs(wxStringList("../../lib", 0));
+    project.SetDebugLibDirs(wxStringList("../../src/Debug", "../../src/jpeg/Debug", "../../src/tiff/Debug", 0));
+    project.SetReleaseLibDirs(wxStringList("../../src/Release", "../../src/jpeg/Release", "../../src/tiff/Release", 0));
+
+    project.SetProjectName("hhp2cachedVC");
+    project.SetTargetName("hhp2cached");
+    project.SetProjectPath(dir + wxString("/utils/hhp2cached"));
+    project.SetSourceFiles(wxStringList("hhp2cached.cpp", 0));
+
+    if (!project.GenerateVCProject())
+    {
+        wxString msg("Could not generate hhp2cached project");
+        wxMessageBox(msg);
+    }
+

     // wxTreeLayout sample
 
     project.SetIncludeDirs(wxStringList("../../../include", 0));
     // wxTreeLayout sample
 
     project.SetIncludeDirs(wxStringList("../../../include", 0));