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

diff --git a/docs/latex/wx/config.tex b/docs/latex/wx/config.tex
index 30a6a6aeab704898b2a705c45c5317beeb334c9d..39301fd9f59318d4125a83b614640134dac180ec 100644 (file)
--- 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 dd7eada3507475eaa4456a694f75c0a7f0179938..7bb4d774d2ec56f27b10d921de8aecc3653dedf5 100644 (file)
--- 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 ee1ed4a49894a2f07c42123f2c3f6d0c000eac71..72167440743bb0dd3b66650abdf48ff188ac6970 100644 (file)
--- 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 ebaf7fb1a4cfc03600b920b9ccc6c75b6e003667..72b2242859c9b1f5b9946a2750420beae1e4cfc5 100644 (file)
--- 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 43d8c3717649f8f6647d6c78559db5dcd8778168..5bf567ae88d787ec44eb4b000f61a6857265055a 100644 (file)
--- 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 127a3da550ae0bc19eeb8151993d235635f14f61..b4c66636ff47bd68b1b41c15c2ec67cd003c81c9 100644 (file)
--- 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 613d6db147a6b1302c5a42ade025e5f37cd35e00..442cd0fee0484a6d7645bd4893e3d9c361d88f14 100644 (file)
--- 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 065cd7da36cb7c443428874504ecf5f67fc8c92f..46c0f1cddce926f3eddffd2011da5bef28a8e2ac 100644 (file)
--- 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 e68681584544c9374324c0513b40fde41292359e..8445b73952b945efa7fb3f84b9cd5b79d634675a 100644 (file)
--- 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 74b3123938b833af897fb7c125c10d8bb6fa3d37..a5d0845627958b786ba6814edf705f9a60c55c40 100644 (file)
--- 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 d304d8bbc92468424c62cbb9ee96a05ef2b34dc9..96a461eaaf127b255045b6d5ed9f51fecafc886e 100644 (file)
--- 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 c16843cb8afa6d110e97a3383cc94dce04f785c6..b115aa8ed6e9530a298945e2d1b960af0e59f94f 100644 (file)
--- 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 e5a55c54a9dfe659428cca0f4820483aebca9406..32d2b0859a669c93583a995e68ccbd5614a8a41d 100644 (file)
--- 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 cfd271d228ec8ba011d9c5284f0ee43b194ca431..f636c68dcf81e081bcae5d65794cf2d1e6f486a0 100644 (file)
--- 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>