From 6776a0b25c1122df4e2a29655ed9de2fcde1735f Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 6 May 1999 08:38:01 +0000
Subject: [PATCH] Some doc corrections; various small fixes for Cygwin and BC++

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/latex/wx/config.tex   | 2 +-
 docs/latex/wx/document.tex | 5 ++---
 docs/latex/wx/function.tex | 4 ++--
 docs/latex/wx/menu.tex     | 2 +-
 docs/latex/wx/wx.hpj       | 2 +-
 include/wx/defs.h          | 3 +++
 include/wx/string.h        | 2 ++
 include/wx/wxchar.h        | 2 ++
 src/common/cmndata.cpp     | 1 +
 src/msw/checklst.cpp       | 1 +
 src/msw/dcprint.cpp        | 3 ++-
 src/msw/frame.cpp          | 1 +
 src/msw/menuitem.cpp       | 1 +
 src/msw/printwin.cpp       | 1 +
 14 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/docs/latex/wx/config.tex b/docs/latex/wx/config.tex
index 30a6a6aeab..39301fd9f5 100644
--- a/docs/latex/wx/config.tex
+++ b/docs/latex/wx/config.tex
@@ -443,7 +443,7 @@ Returns the type of the given entry or {\it Unknown} if the entry doesn't
 exist. This function should be used to decide which version of Read() should
 be used because some of wxConfig implementations will complain about type
 mismatch otherwise: e.g., an attempt to read a string value from an integer
-key with \helpref{wxRegConfig}{wxregconfig} will fail.
+key with wxRegConfig will fail.
 
 The result is an element of enum EntryType:
 
diff --git a/docs/latex/wx/document.tex b/docs/latex/wx/document.tex
index dd7eada350..7bb4d774d2 100644
--- a/docs/latex/wx/document.tex
+++ b/docs/latex/wx/document.tex
@@ -144,7 +144,7 @@ dialog boxes. By default, uses the frame associated with the first view.
 Gets the filename associated with this document, or "" if none is
 associated.
 
-\membersection{wxDocument::GetFirstView}{wxdocumentgetfirstview}
+\membersection{wxDocument::GetFirstView}\label{wxdocumentgetfirstview}
 
 \constfunc{wxView *}{GetFirstView}{\void}
 
@@ -169,7 +169,7 @@ Gets the title for this document. The document title is used for an associated
 frame (if any), and is usually constructed by the framework from
 the filename.
 
-\membersection{wxDocument::GetViews}{wxdocumentgetviews}
+\membersection{wxDocument::GetViews}\label{wxdocumentgetviews}
 
 \constfunc{wxList \&}{GetViews}{\void}
 
@@ -177,7 +177,6 @@ Returns the list whose elements are the views on the document.
 
 See also: \helpref{GetFirstView}{wxdocumentgetfirstview}
 
-
 \membersection{wxDocument::IsModified}\label{wxdocumentismodified}
 
 \constfunc{virtual bool}{IsModified}{\void}
diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index ee1ed4a498..7216744074 100644
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -1378,7 +1378,7 @@ Now obsolete: use \helpref{wxWindow::Close}{wxwindowclose} instead.
 
 <wx/utils.h>
 
-\membersection{::wxSafeYield}{wxsafeyield}
+\membersection{::wxSafeYield}\label{wxsafeyield}
 
 \func{bool}{wxSafeYield}{\param{wxWindow*}{ win = NULL}}
 
@@ -1393,7 +1393,7 @@ Returns the result of the call to \helpref{::wxYield}{wxyield}.
 
 <wx/utils.h>
 
-\membersection{::wxEnableTopLevelWindows}{wxenabletoplevelwindows}
+\membersection{::wxEnableTopLevelWindows}\label{wxenabletoplevelwindows}
 
 \func{void}{wxEnableTopLevelWindow}{\param{bool}{ enable = TRUE}}
 
diff --git a/docs/latex/wx/menu.tex b/docs/latex/wx/menu.tex
index ebaf7fb1a4..72b2242859 100644
--- a/docs/latex/wx/menu.tex
+++ b/docs/latex/wx/menu.tex
@@ -199,7 +199,7 @@ before matching.
 
 \helpref{wxMenu::FindItemForId}{wxmenufinditemforid}
 
-\membersection{wxMenu::FindItemForId}\label{wxmenufinditem}
+\membersection{wxMenu::FindItemForId}\label{wxmenufinditemforid}
 
 \constfunc{wxMenuItem*}{FindItemForId}{\param{int}{ id}, \param{wxMenu **}{ menuForItem = NULL}}
 
diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index 43d8c37176..5bf567ae88 100644
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=d:\wx2\wxWindows\docs\latex\wx ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 127a3da550..b4c66636ff 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -185,6 +185,9 @@
     #elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
         // Watcom 11+ supports bool
         #define HAVE_BOOL
+    #elif defined(__GNUWIN32__)
+        // Cygwin supports bool
+        #define HAVE_BOOL
     #endif // compilers
 #endif // HAVE_BOOL
 
diff --git a/include/wx/string.h b/include/wx/string.h
index 613d6db147..442cd0fee0 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -272,6 +272,8 @@ WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile;
 #define wxConv_file wxConvFile
 WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 #define wxConv_current wxConvCurrent
+#define wxFNCONV(name) name
+#define FNSTRINGCAST WXSTRINGCAST
 #endif//wxUSE_WCHAR_T
 
 // ---------------------------------------------------------------------------
diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 065cd7da36..46c0f1cddc 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -216,6 +216,8 @@ inline WORD __wxMSW_ctype(wxChar ch)
   #else
    #define wxUSE_WCHAR_T 0
   #endif
+ #elif defined(__GNUWIN32__) && !defined(__MINGW32__) // Cygwin (not Mingw32) doesn't have wcslen.h, needed in buffer.h
+  #define wxUSE_WCHAR_T 0
  #else
   // add additional compiler checks if this fails
   #define wxUSE_WCHAR_T 1
diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index e686815845..8445b73952 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -37,6 +37,7 @@
 
 #include "wx/gdicmn.h"
 #include "wx/cmndata.h"
+#include "wx/log.h"
 
 #include "wx/paper.h"
 
diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 74b3123938..a5d0845627 100644
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -40,6 +40,7 @@
 #include "wx/settings.h"
 #include "wx/dcmemory.h"
 #include "wx/msw/checklst.h"
+#include "wx/log.h"
 
 #include <windows.h>
 #include <windowsx.h>
diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index d304d8bbc9..96a461eaaf 100644
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -24,6 +24,7 @@
 #endif
 
 #include "wx/dcprint.h"
+#include "wx/log.h"
 #include "math.h"
 
 #include <windows.h>
@@ -194,7 +195,7 @@ bool wxPrinterDC::StartDoc(const wxString& message)
     if (ret <= 0)
     {
         DWORD lastError = GetLastError();
-        wxDebugMsg("wxDC::StartDoc failed with error: %d\n", lastError);
+        wxLogDebug("wxDC::StartDoc failed with error: %d\n", lastError);
     }
 #endif
     
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index c16843cb8a..b115aa8ed6 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -35,6 +35,7 @@
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/menuitem.h"
+#include "wx/log.h"
 
 #ifdef LoadAccelerators
 #undef LoadAccelerators
diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index e5a55c54a9..32d2b0859a 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -38,6 +38,7 @@
 
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
+#include "wx/log.h"
 
 #include <windows.h>
 
diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index cfd271d228..f636c68dcf 100644
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -40,6 +40,7 @@
 #include "wx/msw/printwin.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
+#include "wx/log.h"
 #include "wx/msw/private.h"
 
 #include <stdlib.h>
-- 
2.45.2

