From 38009d396d9b48d4ef8dad86921a870481742d33 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 15 Jun 1998 07:57:40 +0000
Subject: [PATCH] Corrected some problems I introduced, added tabevent.tex.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/latex/wx/tabevent.tex | 37 +++++++++++++++++++++++++++++++++++++
 docs/msw/todo.txt          |  1 +
 include/wx/msw/helpwin.h   |  2 +-
 src/gtk/threadpsx.cpp      |  2 +-
 src/gtk1/threadpsx.cpp     |  2 +-
 src/msw/helpwin.cpp        |  2 +-
 src/msw/thread.cpp         |  4 ++--
 7 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 docs/latex/wx/tabevent.tex

diff --git a/docs/latex/wx/tabevent.tex b/docs/latex/wx/tabevent.tex
new file mode 100644
index 0000000000..0ec2f36aad
--- /dev/null
+++ b/docs/latex/wx/tabevent.tex
@@ -0,0 +1,37 @@
+\section{\class{wxTabEvent}}\label{wxtabevent}
+
+This class represents the events generated by a tab control.
+
+\wxheading{Derived from}
+
+\helpref{wxCommandEvent}{wxcommandevent}\\
+\helpref{wxEvent}{wxevent}\\
+\helpref{wxEvtHandler}{wxevthandler}\\
+\helpref{wxObject}{wxobject}
+
+\wxheading{Event table macros}
+
+To process a tab event, use these event handler macros to direct input to member
+functions that take a wxTabEvent argument.
+
+\twocolwidtha{7cm}
+\begin{twocollist}\itemsep=0pt
+\twocolitem{{\bf EVT\_TAB\_SEL\_CHANGED(id, func)}}{Process a wxEVT\_TAB\_SEL\_CHANGED event, indicating that
+the tab selection has changed.}
+\twocolitem{{\bf EVT\_TAB\_SEL\_CHANGING(id, func)}}{Process a wxEVT\_TAB\_SEL\_CHANGING event, indicating that
+the tab selection is changing.}
+\end{twocollist}%
+
+\wxheading{See also}
+
+\helpref{wxTabCtrl}{wxtabctrl}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxTabEvent::wxTabEvent}\label{wxtabeventconstr}
+
+\func{}{wxTabEvent}{\param{WXTYPE}{ commandType = 0}, \param{int}{ id = 0}}
+
+Constructor.
+
+
diff --git a/docs/msw/todo.txt b/docs/msw/todo.txt
index 96c0421169..dba3e00493 100644
--- a/docs/msw/todo.txt
+++ b/docs/msw/todo.txt
@@ -54,6 +54,7 @@ Update manual.
     wxBaseArray, other arrays
     (wxOwnerDrawn)
     Document the include file for each class
+    Macros, e.g. wxASSERT
 
 Write tutorial.
 
diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index 01b2eecf05..4d460f037a 100644
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
   ~wxWinHelpController(void);
 
   // Must call this to set the filename and server name
-  virtual bool Initialize(const wxString& file, int server = -1);
+  virtual bool Initialize(const wxString& file);
 
   // If file is "", reloads file given  in Initialize
   virtual bool LoadFile(const wxString& file = "");
diff --git a/src/gtk/threadpsx.cpp b/src/gtk/threadpsx.cpp
index 07b5103654..9f6620f0c1 100644
--- a/src/gtk/threadpsx.cpp
+++ b/src/gtk/threadpsx.cpp
@@ -278,7 +278,7 @@ void wxThread::TestDestroy()
   pthread_testcancel();
 }
 
-bool wxThread::IsMain() const
+bool wxThread::IsMain()
 {
   return (bool)pthread_equal(pthread_self(), p_mainid);
 }
diff --git a/src/gtk1/threadpsx.cpp b/src/gtk1/threadpsx.cpp
index 07b5103654..9f6620f0c1 100644
--- a/src/gtk1/threadpsx.cpp
+++ b/src/gtk1/threadpsx.cpp
@@ -278,7 +278,7 @@ void wxThread::TestDestroy()
   pthread_testcancel();
 }
 
-bool wxThread::IsMain() const
+bool wxThread::IsMain()
 {
   return (bool)pthread_equal(pthread_self(), p_mainid);
 }
diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index dab0ab5396..9e1e6a5997 100644
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -54,7 +54,7 @@ wxWinHelpController::~wxWinHelpController(void)
 {
 }
 
-bool wxWinHelpController::Initialize(const wxString& filename, int server)
+bool wxWinHelpController::Initialize(const wxString& filename)
 {
   m_helpFile = filename;
   return TRUE;
diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 33ca0a645a..4cd91e87c0 100644
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -233,7 +233,7 @@ void wxThread::SetPriority(int prio)
   p_internal->prio = prio;
 }
 
-int wxThread::GetPriority()
+int wxThread::GetPriority() const
 {
   return p_internal->prio;
 }
@@ -275,7 +275,7 @@ unsigned long wxThread::GetID() const
   return (unsigned long)p_internal->tid;
 }
 
-bool wxThread::IsMain() const
+bool wxThread::IsMain()
 {
   return (GetCurrentThread() == p_mainid);
 }
-- 
2.45.2