Some corrections for BC++ compilation; Latex doc corrections

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

diff --git a/docs/latex/wx/bmpdatob.tex b/docs/latex/wx/bmpdatob.tex
index 3c2c283193e67e0386cd9b45e3aac28dceae0a40..4054579c659199e37c835df1b17205fb16465077 100644 (file)
--- a/docs/latex/wx/bmpdatob.tex
+++ b/docs/latex/wx/bmpdatob.tex
@@ -23,7 +23,7 @@ and \helpref{WriteData}{wxbitmapdataobjectwritedata} will have to be overridden.
 
 \func{}{wxBitmapDataObject}{\void}
 
-Default constructor. Call \helpref{SetBitmap}{wxbitmapdataobjectsettext} later
+Default constructor. Call \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap} later
 or override \helpref{WriteData}{wxbitmapdataobjectwritedata} and 
 \helpref{GetSize}{wxbitmapdataobjectgetsize} for providing data on-demand.
 
@@ -36,7 +36,7 @@ Constructor, passing a bitmap.
 \constfunc{virtual size\_t}{GetSize}{\void}
 
 Returns the data size. By default, returns the size of the bitmap data
-set in the constructor or using \helpref{SetBitmap}{wxbitmapdataobjectsettext}.
+set in the constructor or using \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap}.
 This can be overridden to provide size data on-demand. Note that you'd
 have to call the inherited GetSize method as this is the only way
 to get to know the transfer size of the bitmap in a platform dependent
@@ -82,7 +82,7 @@ this method when offering data on-demand, but this is not required by
 wxWindows' internals. Use this method to get data in bitmap form from
 the \helpref{wxClipboard}{wxclipboard}.
 
-\membersection{wxBitmapDataObject::SetBitmap}\label{wxbitmapdataobjectsettext}
+\membersection{wxBitmapDataObject::SetBitmap}\label{wxbitmapdataobjectsetbitmap}
 
 \func{virtual void}{SetBitmap}{\param{const wxBitmap\& }{bitmap}}
 

diff --git a/docs/latex/wx/txtdatob.tex b/docs/latex/wx/txtdatob.tex
index 22a4b5341db97051bc75889f9197e0169851478e..a30b181533837236c316eec44777525c90be6eb7 100644 (file)
--- a/docs/latex/wx/txtdatob.tex
+++ b/docs/latex/wx/txtdatob.tex
@@ -64,10 +64,10 @@ on-demand).
 \constfunc{virtual void}{WriteData}{\param{void}{*dest} }
 
 Write the data owned by this class to {\it dest}. By default, this
-calls \helpref{WriteString}{wxtextobjectwritestring} with the string
+calls \helpref{WriteString}{wxtextdataobjectwritestring} with the string
 set in the constructor or using \helpref{SetText}{wxtextdataobjectsettext}.
-This can be overridden to provide text data on-demand; in this case
-\helpref{WriteString}{wxtextobjectwritestring} must be called from
+This can be overridden to provide text data on-demand; in this case 
+\helpref{WriteString}{wxtextdataobjectwritestring} must be called from
 within the overriding WriteData() method.
 
 \membersection{wxTextDataObject::WriteString}\label{wxtextdataobjectwritestring}

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 94ac9fa3fe2bd11b03e8599c1d5c566cc6dbe851..a17235451cb2fbe7eae4a30e783886b5776762e2 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -27,6 +27,7 @@ class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxCursor;
+class WXDLLEXPORT wxControl;
 
 // A mask is a mono bitmap used for drawing bitmaps
 // transparently.
@@ -129,9 +130,8 @@ public:
   // Initialize with raw data
   wxBitmap(const char bits[], int width, int height, int depth = 1);
 
-  class WXDLLEXPORT wxItem;
   // Initialize with XPM data
-  wxBitmap(char **data, wxItem *anItem = NULL);
+  wxBitmap(char **data, wxControl *anItem = NULL);
 
   // Load a file or resource
   wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index f4694aff5c11abdfc7a909ae1af81497baa477fc..8f43954176a372e7f9a5d3e821aaadb5a29090c5 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -162,19 +162,7 @@ public:
     // get value type
   ValueType GetValueType(const char *szValue) const;
     // returns TRUE if the value contains a number (else it's some string)
-  bool IsNumericValue(const char *szValue) const
-  { 
-      ValueType type = GetValueType(szValue);
-      switch ( type ) {
-        case Type_Dword:
-        case Type_Dword_little_endian:
-        case Type_Dword_big_endian:
-            return TRUE;
-
-        default:
-            return FALSE;
-      }
-  }
+  bool IsNumericValue(const char *szValue) const;
 
     // assignment operators set the default value of the key
   wxRegKey& operator=(const wxString& strValue)

diff --git a/include/wx/string.h b/include/wx/string.h
index c23b431316173d0eb23dd4e1ceed7da8505f8bf5..86ed776391c9e537c111095e20d093f84f1c6615 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -450,11 +450,12 @@ public:
       // convert to upper case in place, return the string itself
   wxString& MakeUpper();
       // convert to upper case, return the copy of the string
-  wxString Upper() const { wxString s(*this); return s.MakeUpper(); }
+      // Here's something to remember: BC++ doesn't like returns in inlines.
+  wxString Upper() const ;
       // convert to lower case in place, return the string itself
   wxString& MakeLower();
       // convert to lower case, return the copy of the string
-  wxString Lower() const { wxString s(*this); return s.MakeLower(); }
+  wxString Lower() const ;
 
   // trimming/padding whitespace (either side) and truncating
       // remove spaces from left or from right (default) side

diff --git a/include/wx/version.h b/include/wx/version.h
index 07fa7a7293638012d88f2304ea53024f0db9da06..0c765e74935432aa6c03d2fbefab61527177ecac 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -18,7 +18,7 @@
 #define wxRELEASE_NUMBER   1
 #define wxVERSION_STRING "wxWindows 2.0.1"
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
-#define wxBETA_NUMBER      17
+#define wxBETA_NUMBER      3
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 5329f085e2a062bfa271e9282dac0a1278fa45a8..0566dae04029785e4556b1f82e8c13987edf265d 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1092,6 +1092,13 @@ int wxString::Freq(char ch) const
     return count;
 }
 
+// convert to upper case, return the copy of the string
+wxString wxString::Upper() const
+{ wxString s(*this); return s.MakeUpper(); }
+
+// convert to lower case, return the copy of the string
+wxString wxString::Lower() const { wxString s(*this); return s.MakeLower(); }
+
 // ---------------------------------------------------------------------------
 // standard C++ library string functions
 // ---------------------------------------------------------------------------

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 948d339184fe132a33e33368df577d4e6cdcb955..ff62b502936de52e6eb0aa01c558d5e7dc238146 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -142,7 +142,7 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
 }
 
 // Create from XPM data
-wxBitmap::wxBitmap(char **data, wxItem *WXUNUSED(anItem))
+wxBitmap::wxBitmap(char **data, wxControl *WXUNUSED(anItem))
 {
   (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index f2af16d92471c5344034ee4f6797f3570cdf8bfa..d8fe4dfa5a7c7abe35a34fe58c2a8fa9c26c126d 100644 (file)
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -34,15 +34,16 @@
 #include "wx/module.h"
 #include "wx/dde.h"
 
+#include "wx/msw/private.h"
+#include <windows.h>
+#include <ddeml.h>
+
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
 
-#include "wx/msw/private.h"
-#include <windows.h>
-#include <ddeml.h>
 #include <string.h>
 
 #ifdef __WIN32__

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index 5d59c9ee38fae38795c75cd3b38934ae36b8d87d..099b376cfd5dffd1f0b1ef33e1401988efe9fec7 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -788,6 +788,21 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const
   return TRUE;
 }
 
+// returns TRUE if the value contains a number (else it's some string)
+bool wxRegKey::IsNumericValue(const char *szValue) const
+  { 
+      ValueType type = GetValueType(szValue);
+      switch ( type ) {
+        case Type_Dword:
+        case Type_Dword_little_endian:
+        case Type_Dword_big_endian:
+            return TRUE;
+
+        default:
+            return FALSE;
+      }
+  }
+
 // ============================================================================
 // implementation of global private functions
 // ============================================================================