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
This commit is contained in:
Julian Smart
1999-01-31 11:42:58 +00:00
parent ac0d36b523
commit 03ab016d66
10 changed files with 40 additions and 28 deletions

View File

@@ -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);

View File

@@ -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)

View File

@@ -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

View File

@@ -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