Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxNOT_FOUND/wxDefaultCoord, TRUE/true, FALSE/false.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-09-24 14:32:35 +00:00
parent 02161c7c81
commit cab1a6053d
42 changed files with 651 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/valgen.h
View File

@@ -41,7 +41,7 @@ public:
// Called when the value in the window must be validated. // Called when the value in the window must be validated.
// This function can pop up an error message. // This function can pop up an error message.
virtual bool Validate(wxWindow * WXUNUSED(parent)) { return TRUE; } virtual bool Validate(wxWindow * WXUNUSED(parent)) { return true; }
// Called to transfer data to the window // Called to transfer data to the window
virtual bool TransferToWindow(); virtual bool TransferToWindow();

10
include/wx/validate.h
View File

@@ -50,17 +50,17 @@ public:
virtual wxObject *Clone() const virtual wxObject *Clone() const
{ return (wxValidator *)NULL; } { return (wxValidator *)NULL; }
bool Copy(const wxValidator& val) bool Copy(const wxValidator& val)
{ m_validatorWindow = val.m_validatorWindow; return TRUE; } { m_validatorWindow = val.m_validatorWindow; return true; }
// Called when the value in the window must be validated. // Called when the value in the window must be validated.
// This function can pop up an error message. // This function can pop up an error message.
virtual bool Validate(wxWindow *WXUNUSED(parent)) { return FALSE; }; virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; };
// Called to transfer data to the window // Called to transfer data to the window
virtual bool TransferToWindow() { return FALSE; } virtual bool TransferToWindow() { return false; }
// Called to transfer data from the window // Called to transfer data from the window
virtual bool TransferFromWindow() { return FALSE; }; virtual bool TransferFromWindow() { return false; };
// accessors // accessors
wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; } wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; }
@@ -69,7 +69,7 @@ public:
// validators beep by default if invalid key is pressed, these functions // validators beep by default if invalid key is pressed, these functions
// allow to change it // allow to change it
static bool IsSilent() { return ms_isSilent; } static bool IsSilent() { return ms_isSilent; }
static void SetBellOnError(bool doIt = TRUE) { ms_isSilent = doIt; } static void SetBellOnError(bool doIt = true) { ms_isSilent = doIt; }
protected: protected:
wxWindowBase *m_validatorWindow; wxWindowBase *m_validatorWindow;

8
include/wx/valtext.h
View File

@@ -86,14 +86,14 @@ protected:
bool CheckValidator() const bool CheckValidator() const
{ {
wxCHECK_MSG( m_validatorWindow, FALSE, wxCHECK_MSG( m_validatorWindow, false,
_T("No window associated with validator") ); _T("No window associated with validator") );
wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), FALSE, wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), false,
_T("wxTextValidator is only for wxTextCtrl's") ); _T("wxTextValidator is only for wxTextCtrl's") );
wxCHECK_MSG( m_stringValue, FALSE, wxCHECK_MSG( m_stringValue, false,
_T("No variable storage for validator") ); _T("No variable storage for validator") );
return TRUE; return true;
} }
private: private:

2
include/wx/variant.h
View File

@@ -240,7 +240,7 @@ public:
// Insert at front of list // Insert at front of list
void Insert(const wxVariant& value); void Insert(const wxVariant& value);
// Returns TRUE if the variant is a member of the list // Returns true if the variant is a member of the list
bool Member(const wxVariant& value) const; bool Member(const wxVariant& value) const;
// Deletes the nth element of the list // Deletes the nth element of the list

2
include/wx/window.h
View File

@@ -1202,7 +1202,7 @@ protected:
void SetBestSize(const wxSize& size) { SetBestFittingSize(size); } void SetBestSize(const wxSize& size) { SetBestFittingSize(size); }
// set the initial window size if none is given (i.e. at least one of the // set the initial window size if none is given (i.e. at least one of the
// components of the size passed to ctor/Create() is -1) // components of the size passed to ctor/Create() is wxDefaultCoord)
// //
// normally just calls SetBestSize() for controls, but can be overridden // normally just calls SetBestSize() for controls, but can be overridden
// not to do it for the controls which have to do some additional // not to do it for the controls which have to do some additional

28
include/wx/wizard.h
View File

@@ -180,7 +180,7 @@ public:
function taking the following arguments: function taking the following arguments:
wxWizard(wxWindow *parent, wxWizard(wxWindow *parent,
int id = -1, int id = wxID_ANY,
const wxString& title = wxEmptyString, const wxString& title = wxEmptyString,
const wxBitmap& bitmap = wxNullBitmap, const wxBitmap& bitmap = wxNullBitmap,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -188,8 +188,8 @@ public:
*/ */
wxWizardBase() { } wxWizardBase() { }
// executes the wizard starting from the given page, returns TRUE if it was // executes the wizard starting from the given page, returns true if it was
// successfully finished, FALSE if user cancelled it // successfully finished, false if user cancelled it
virtual bool RunWizard(wxWizardPage *firstPage) = 0; virtual bool RunWizard(wxWizardPage *firstPage) = 0;
// get the current page (NULL if RunWizard() isn't running) // get the current page (NULL if RunWizard() isn't running)
@@ -222,7 +222,7 @@ public:
// wxWizard should be created using "new wxWizard" now, not with Create() // wxWizard should be created using "new wxWizard" now, not with Create()
#if WXWIN_COMPATIBILITY_2_2 #if WXWIN_COMPATIBILITY_2_2
static wxWizard *Create(wxWindow *parent, static wxWizard *Create(wxWindow *parent,
int id = -1, int id = wxID_ANY,
const wxString& title = wxEmptyString, const wxString& title = wxEmptyString,
const wxBitmap& bitmap = wxNullBitmap, const wxBitmap& bitmap = wxNullBitmap,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -262,13 +262,13 @@ class WXDLLIMPEXP_ADV wxWizardEvent : public wxNotifyEvent
{ {
public: public:
wxWizardEvent(wxEventType type = wxEVT_NULL, wxWizardEvent(wxEventType type = wxEVT_NULL,
int id = -1, int id = wxID_ANY,
bool direction = TRUE, bool direction = true,
wxWizardPage* page = NULL); wxWizardPage* page = NULL);
// for EVT_WIZARD_PAGE_CHANGING, return TRUE if we're going forward or // for EVT_WIZARD_PAGE_CHANGING, return true if we're going forward or
// FALSE otherwise and for EVT_WIZARD_PAGE_CHANGED return TRUE if we came // false otherwise and for EVT_WIZARD_PAGE_CHANGED return true if we came
// from the previous page and FALSE if we returned from the next one // from the previous page and false if we returned from the next one
// (this function doesn't make sense for CANCEL events) // (this function doesn't make sense for CANCEL events)
bool GetDirection() const { return m_direction; } bool GetDirection() const { return m_direction; }
@@ -297,21 +297,21 @@ END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&); typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&);
// notifies that the page has just been changed (can't be vetoed) // notifies that the page has just been changed (can't be vetoed)
#define EVT_WIZARD_PAGE_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_PAGE_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL), #define EVT_WIZARD_PAGE_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_PAGE_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
// the user pressed "<Back" or "Next>" button and the page is going to be // the user pressed "<Back" or "Next>" button and the page is going to be
// changed - unless the event handler vetoes the event // changed - unless the event handler vetoes the event
#define EVT_WIZARD_PAGE_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_PAGE_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL), #define EVT_WIZARD_PAGE_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_PAGE_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
// the user pressed "Cancel" button and the wizard is going to be dismissed - // the user pressed "Cancel" button and the wizard is going to be dismissed -
// unless the event handler vetoes the event // unless the event handler vetoes the event
#define EVT_WIZARD_CANCEL(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_CANCEL, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL), #define EVT_WIZARD_CANCEL(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_CANCEL, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
// the user pressed "Finish" button and the wizard is going to be dismissed - // the user pressed "Finish" button and the wizard is going to be dismissed -
#define EVT_WIZARD_FINISHED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_FINISHED, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL), #define EVT_WIZARD_FINISHED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_FINISHED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
// the user pressed "Help" button // the user pressed "Help" button
#define EVT_WIZARD_HELP(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_HELP, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL), #define EVT_WIZARD_HELP(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_HELP, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
#endif // wxUSE_WIZARDDLG #endif // wxUSE_WIZARDDLG

5
include/wx/xti.h
View File

@@ -1228,7 +1228,7 @@ public :
const wxString& GetName() const { return m_name ; } const wxString& GetName() const { return m_name ; }
// return the class info of the event // return the class info of the event
const wxClassInfo * GetEventClassInfo() const { return m_eventClassInfo ; } const wxClassInfo *GetEventClassInfo() const { return m_eventClassInfo ; }
// get the handler function pointer // get the handler function pointer
wxObjectEventFunction GetEventFunction() const { return m_eventFunction ; } wxObjectEventFunction GetEventFunction() const { return m_eventFunction ; }
@@ -1739,7 +1739,8 @@ public:
// we must be able to cast variants to wxObject pointers, templates seem not to be suitable // we must be able to cast variants to wxObject pointers, templates seem not to be suitable
wxObject* VariantToInstance( wxxVariant &data ) const wxObject* VariantToInstance( wxxVariant &data ) const
{ if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT ) {
if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT )
return m_variantToObjectConverter( data ) ; return m_variantToObjectConverter( data ) ;
else else
return m_variantOfPtrToObjectConverter( data ) ; return m_variantOfPtrToObjectConverter( data ) ;

4
include/wx/xtistrm.h
View File

@@ -55,11 +55,11 @@ public :
// will be called after this object has been written, may be needed for adjusting stacks // will be called after this object has been written, may be needed for adjusting stacks
virtual void AfterWriteObject( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object) , const wxClassInfo *WXUNUSED(classInfo) ) {} virtual void AfterWriteObject( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object) , const wxClassInfo *WXUNUSED(classInfo) ) {}
// will be called before a property gets written, may change the value , eg replace a concrete wxSize by wxSize( -1 , -1 ) or veto // will be called before a property gets written, may change the value , eg replace a concrete wxSize by wxSize( wxDefaultCoord , wxDefaultCoord ) or veto
// writing that property at all by returning false // writing that property at all by returning false
virtual bool BeforeWriteProperty( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxPropertyInfo *WXUNUSED(propInfo) , wxxVariant &WXUNUSED(value) ) { return true ; } virtual bool BeforeWriteProperty( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxPropertyInfo *WXUNUSED(propInfo) , wxxVariant &WXUNUSED(value) ) { return true ; }
// will be called before a property gets written, may change the value , eg replace a concrete wxSize by wxSize( -1 , -1 ) or veto // will be called before a property gets written, may change the value , eg replace a concrete wxSize by wxSize( wxDefaultCoord , wxDefaultCoord ) or veto
// writing that property at all by returning false // writing that property at all by returning false
virtual bool BeforeWriteProperty( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxPropertyInfo *WXUNUSED(propInfo) , wxxVariantArray &WXUNUSED(value) ) { return true ; } virtual bool BeforeWriteProperty( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxPropertyInfo *WXUNUSED(propInfo) , wxxVariantArray &WXUNUSED(value) ) { return true ; }

94
src/common/valgen.cpp
View File

@@ -97,7 +97,7 @@ bool wxGenericValidator::Copy(const wxGenericValidator& val)
m_pString = val.m_pString; m_pString = val.m_pString;
m_pArrayInt = val.m_pArrayInt; m_pArrayInt = val.m_pArrayInt;
return TRUE; return true;
} }
wxGenericValidator::~wxGenericValidator() wxGenericValidator::~wxGenericValidator()
@@ -108,7 +108,7 @@ wxGenericValidator::~wxGenericValidator()
bool wxGenericValidator::TransferToWindow(void) bool wxGenericValidator::TransferToWindow(void)
{ {
if ( !m_validatorWindow ) if ( !m_validatorWindow )
return FALSE; return false;
// bool controls // bool controls
#if wxUSE_CHECKBOX #if wxUSE_CHECKBOX
@@ -118,7 +118,7 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pBool) if (m_pBool)
{ {
pControl->SetValue(*m_pBool); pControl->SetValue(*m_pBool);
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -129,7 +129,7 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pBool) if (m_pBool)
{ {
pControl->SetValue(*m_pBool) ; pControl->SetValue(*m_pBool) ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -142,7 +142,7 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pInt) if (m_pInt)
{ {
pControl->SetValue(*m_pInt); pControl->SetValue(*m_pInt);
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -153,7 +153,7 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pInt) if (m_pInt)
{ {
pControl->SetSelection(*m_pInt) ; pControl->SetSelection(*m_pInt) ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -164,7 +164,7 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pInt) if (m_pInt)
{ {
pControl->SetThumbPosition(*m_pInt) ; pControl->SetThumbPosition(*m_pInt) ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -175,7 +175,7 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pInt) if (m_pInt)
{ {
pControl->SetValue(*m_pInt); pControl->SetValue(*m_pInt);
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -186,7 +186,7 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pInt) if (m_pInt)
{ {
pControl->SetValue(*m_pInt) ; pControl->SetValue(*m_pInt) ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -197,7 +197,7 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pInt) if (m_pInt)
{ {
pControl->SetValue(*m_pInt) ; pControl->SetValue(*m_pInt) ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -210,7 +210,7 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pString) if (m_pString)
{ {
pControl->SetLabel(*m_pString) ; pControl->SetLabel(*m_pString) ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -221,11 +221,11 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pInt) if (m_pInt)
{ {
pControl->SetSelection(*m_pInt) ; pControl->SetSelection(*m_pInt) ;
return TRUE; return true;
} }
else if (m_pString) else if (m_pString)
{ {
if (pControl->FindString(* m_pString) > -1) if (pControl->FindString(* m_pString) != wxNOT_FOUND)
{ {
pControl->SetStringSelection(* m_pString); pControl->SetStringSelection(* m_pString);
} }
@@ -233,7 +233,7 @@ bool wxGenericValidator::TransferToWindow(void)
{ {
pControl->SetValue(* m_pString); pControl->SetValue(* m_pString);
} }
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -244,15 +244,15 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pInt) if (m_pInt)
{ {
pControl->SetSelection(*m_pInt) ; pControl->SetSelection(*m_pInt) ;
return TRUE; return true;
} }
else if (m_pString) else if (m_pString)
{ {
if (pControl->FindString(* m_pString) > -1) if (pControl->FindString(* m_pString) != wxNOT_FOUND)
{ {
pControl->SetStringSelection(* m_pString); pControl->SetStringSelection(* m_pString);
} }
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -262,7 +262,7 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pString) if (m_pString)
{ {
pControl->SetLabel(*m_pString) ; pControl->SetLabel(*m_pString) ;
return TRUE; return true;
} }
} else } else
#if wxUSE_TEXTCTRL #if wxUSE_TEXTCTRL
@@ -272,14 +272,14 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pString) if (m_pString)
{ {
pControl->SetValue(*m_pString) ; pControl->SetValue(*m_pString) ;
return TRUE; return true;
} }
else if (m_pInt) else if (m_pInt)
{ {
wxString str; wxString str;
str.Printf(wxT("%d"), *m_pInt); str.Printf(wxT("%d"), *m_pInt);
pControl->SetValue(str); pControl->SetValue(str);
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -295,17 +295,17 @@ bool wxGenericValidator::TransferToWindow(void)
size_t i, size_t i,
count = pControl->GetCount(); count = pControl->GetCount();
for ( i = 0 ; i < count; i++ ) for ( i = 0 ; i < count; i++ )
pControl->Check(i, FALSE); pControl->Check(i, false);
// select each item in our array // select each item in our array
count = m_pArrayInt->GetCount(); count = m_pArrayInt->GetCount();
for ( i = 0 ; i < count; i++ ) for ( i = 0 ; i < count; i++ )
pControl->Check(m_pArrayInt->Item(i)); pControl->Check(m_pArrayInt->Item(i));
return TRUE; return true;
} }
else else
return FALSE; return false;
} else } else
#endif #endif
#if wxUSE_LISTBOX #if wxUSE_LISTBOX
@@ -325,21 +325,21 @@ bool wxGenericValidator::TransferToWindow(void)
for ( i = 0 ; i < count; i++ ) for ( i = 0 ; i < count; i++ )
pControl->SetSelection(m_pArrayInt->Item(i)); pControl->SetSelection(m_pArrayInt->Item(i));
return TRUE; return true;
} }
} else } else
#endif #endif
; // to match the last 'else' above ; // to match the last 'else' above
// unrecognized control, or bad pointer // unrecognized control, or bad pointer
return FALSE; return false;
} }
// Called to transfer data from the window // Called to transfer data from the window
bool wxGenericValidator::TransferFromWindow(void) bool wxGenericValidator::TransferFromWindow(void)
{ {
if ( !m_validatorWindow ) if ( !m_validatorWindow )
return FALSE; return false;
// bool controls // bool controls
#if wxUSE_CHECKBOX #if wxUSE_CHECKBOX
@@ -349,7 +349,7 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pBool) if (m_pBool)
{ {
*m_pBool = pControl->GetValue() ; *m_pBool = pControl->GetValue() ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -360,7 +360,7 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pBool) if (m_pBool)
{ {
*m_pBool = pControl->GetValue() ; *m_pBool = pControl->GetValue() ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -372,7 +372,7 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pInt) if (m_pInt)
{ {
*m_pInt = pControl->GetValue() ; *m_pInt = pControl->GetValue() ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -383,7 +383,7 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pInt) if (m_pInt)
{ {
*m_pInt = pControl->GetSelection() ; *m_pInt = pControl->GetSelection() ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -394,7 +394,7 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pInt) if (m_pInt)
{ {
*m_pInt = pControl->GetThumbPosition() ; *m_pInt = pControl->GetThumbPosition() ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -405,7 +405,7 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pInt) if (m_pInt)
{ {
*m_pInt=pControl->GetValue(); *m_pInt=pControl->GetValue();
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -416,7 +416,7 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pInt) if (m_pInt)
{ {
*m_pInt = pControl->GetValue() ; *m_pInt = pControl->GetValue() ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -427,7 +427,7 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pInt) if (m_pInt)
{ {
*m_pInt = pControl->GetValue() ; *m_pInt = pControl->GetValue() ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -439,7 +439,7 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pString) if (m_pString)
{ {
*m_pString = pControl->GetLabel() ; *m_pString = pControl->GetLabel() ;
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -450,12 +450,12 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pInt) if (m_pInt)
{ {
*m_pInt = pControl->GetSelection() ; *m_pInt = pControl->GetSelection() ;
return TRUE; return true;
} }
else if (m_pString) else if (m_pString)
{ {
*m_pString = pControl->GetValue(); *m_pString = pControl->GetValue();
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -466,12 +466,12 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pInt) if (m_pInt)
{ {
*m_pInt = pControl->GetSelection() ; *m_pInt = pControl->GetSelection() ;
return TRUE; return true;
} }
else if (m_pString) else if (m_pString)
{ {
*m_pString = pControl->GetStringSelection(); *m_pString = pControl->GetStringSelection();
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -481,7 +481,7 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pString) if (m_pString)
{ {
*m_pString = pControl->GetLabel() ; *m_pString = pControl->GetLabel() ;
return TRUE; return true;
} }
} else } else
#if wxUSE_TEXTCTRL #if wxUSE_TEXTCTRL
@@ -491,12 +491,12 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_pString) if (m_pString)
{ {
*m_pString = pControl->GetValue() ; *m_pString = pControl->GetValue() ;
return TRUE; return true;
} }
else if (m_pInt) else if (m_pInt)
{ {
*m_pInt = wxAtoi(pControl->GetValue()); *m_pInt = wxAtoi(pControl->GetValue());
return TRUE; return true;
} }
} else } else
#endif #endif
@@ -520,10 +520,10 @@ bool wxGenericValidator::TransferFromWindow(void)
m_pArrayInt->Add(i); m_pArrayInt->Add(i);
} }
return TRUE; return true;
} }
else else
return FALSE; return false;
} else } else
#endif #endif
#if wxUSE_LISTBOX #if wxUSE_LISTBOX
@@ -544,14 +544,14 @@ bool wxGenericValidator::TransferFromWindow(void)
m_pArrayInt->Add(i); m_pArrayInt->Add(i);
} }
return TRUE; return true;
} }
} else } else
#endif #endif
// unrecognized control, or bad pointer // unrecognized control, or bad pointer
return FALSE; return false;
return FALSE; return false;
} }
/* /*

4
src/common/validate.cpp
View File

@@ -36,9 +36,9 @@ const wxValidator wxDefaultValidator;
IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
// VZ: personally, I think TRUE would be more appropriate - these bells are // VZ: personally, I think true would be more appropriate - these bells are
// _annoying_ // _annoying_
bool wxValidator::ms_isSilent = FALSE; bool wxValidator::ms_isSilent = false;
wxValidator::wxValidator() wxValidator::wxValidator()
{ {

48
src/common/valtext.cpp
View File

@@ -76,7 +76,7 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
m_includeList = val.m_includeList; m_includeList = val.m_includeList;
m_excludeList = val.m_excludeList; m_excludeList = val.m_excludeList;
return TRUE; return true;
} }
wxTextValidator::~wxTextValidator() wxTextValidator::~wxTextValidator()
@@ -89,9 +89,9 @@ static bool wxIsAlpha(const wxString& val)
for ( i = 0; i < (int)val.Length(); i++) for ( i = 0; i < (int)val.Length(); i++)
{ {
if (!wxIsalpha(val[i])) if (!wxIsalpha(val[i]))
return FALSE; return false;
} }
return TRUE; return true;
} }
static bool wxIsAlphaNumeric(const wxString& val) static bool wxIsAlphaNumeric(const wxString& val)
@@ -100,9 +100,9 @@ static bool wxIsAlphaNumeric(const wxString& val)
for ( i = 0; i < (int)val.Length(); i++) for ( i = 0; i < (int)val.Length(); i++)
{ {
if (!wxIsalnum(val[i])) if (!wxIsalnum(val[i]))
return FALSE; return false;
} }
return TRUE; return true;
} }
// Called when the value in the window must be validated. // Called when the value in the window must be validated.
@@ -110,17 +110,17 @@ static bool wxIsAlphaNumeric(const wxString& val)
bool wxTextValidator::Validate(wxWindow *parent) bool wxTextValidator::Validate(wxWindow *parent)
{ {
if( !CheckValidator() ) if( !CheckValidator() )
return FALSE; return false;
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow; wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
// If window is disabled, simply return // If window is disabled, simply return
if ( !control->IsEnabled() ) if ( !control->IsEnabled() )
return TRUE; return true;
wxString val(control->GetValue()); wxString val(control->GetValue());
bool ok = TRUE; bool ok = true;
// NB: this format string should contian exactly one '%s' // NB: this format string should contian exactly one '%s'
wxString errormsg; wxString errormsg;
@@ -138,25 +138,25 @@ bool wxTextValidator::Validate(wxWindow *parent)
} }
else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() ) else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
{ {
ok = FALSE; ok = false;
errormsg = _("'%s' should only contain ASCII characters."); errormsg = _("'%s' should only contain ASCII characters.");
} }
else if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) ) else if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) )
{ {
ok = FALSE; ok = false;
errormsg = _("'%s' should only contain alphabetic characters."); errormsg = _("'%s' should only contain alphabetic characters.");
} }
else if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val)) else if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val))
{ {
ok = FALSE; ok = false;
errormsg = _("'%s' should only contain alphabetic or numeric characters."); errormsg = _("'%s' should only contain alphabetic or numeric characters.");
} }
else if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val)) else if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val))
{ {
ok = FALSE; ok = false;
errormsg = _("'%s' should be numeric."); errormsg = _("'%s' should be numeric.");
} }
@@ -164,13 +164,13 @@ bool wxTextValidator::Validate(wxWindow *parent)
{ {
//it's only ok to have the members of the list //it's only ok to have the members of the list
errormsg = _("'%s' is invalid"); errormsg = _("'%s' is invalid");
ok = FALSE; ok = false;
} }
else if ( (m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(val)) else if ( (m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(val))
{ {
// it's only ok to have non-members of the list // it's only ok to have non-members of the list
errormsg = _("'%s' is invalid"); errormsg = _("'%s' is invalid");
ok = FALSE; ok = false;
} }
if ( !ok ) if ( !ok )
@@ -193,7 +193,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
bool wxTextValidator::TransferToWindow(void) bool wxTextValidator::TransferToWindow(void)
{ {
if( !CheckValidator() ) if( !CheckValidator() )
return FALSE; return false;
if ( m_stringValue ) if ( m_stringValue )
{ {
@@ -201,14 +201,14 @@ bool wxTextValidator::TransferToWindow(void)
control->SetValue(* m_stringValue); control->SetValue(* m_stringValue);
} }
return TRUE; return true;
} }
// Called to transfer data to the window // Called to transfer data to the window
bool wxTextValidator::TransferFromWindow(void) bool wxTextValidator::TransferFromWindow(void)
{ {
if( !CheckValidator() ) if( !CheckValidator() )
return FALSE; return false;
if ( m_stringValue ) if ( m_stringValue )
{ {
@@ -216,7 +216,7 @@ bool wxTextValidator::TransferFromWindow(void)
*m_stringValue = control->GetValue(); *m_stringValue = control->GetValue();
} }
return TRUE; return true;
} }
void wxTextValidator::SetIncludeList(const wxStringList& list) void wxTextValidator::SetIncludeList(const wxStringList& list)
@@ -273,9 +273,9 @@ static bool wxIsNumeric(const wxString& val)
// Allow for "," (French) as well as "." -- in future we should // Allow for "," (French) as well as "." -- in future we should
// use wxSystemSettings or other to do better localisation // use wxSystemSettings or other to do better localisation
if ((!wxIsdigit(val[i])) && (val[i] != '.') && (val[i] != ',') && (val[i] != wxT('e')) && (val[i] != wxT('E')) && (val[i] != wxT('+')) && (val[i] != wxT('-'))) if ((!wxIsdigit(val[i])) && (val[i] != '.') && (val[i] != ',') && (val[i] != wxT('e')) && (val[i] != wxT('E')) && (val[i] != wxT('+')) && (val[i] != wxT('-')))
return FALSE; return false;
} }
return TRUE; return true;
} }
bool wxTextValidator::IsInCharIncludeList(const wxString& val) bool wxTextValidator::IsInCharIncludeList(const wxString& val)
@@ -284,9 +284,9 @@ bool wxTextValidator::IsInCharIncludeList(const wxString& val)
for ( i = 0; i < val.Length(); i++) for ( i = 0; i < val.Length(); i++)
{ {
if (!m_includeList.Member((wxString) val[i])) if (!m_includeList.Member((wxString) val[i]))
return FALSE; return false;
} }
return TRUE; return true;
} }
bool wxTextValidator::IsNotInCharExcludeList(const wxString& val) bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
@@ -295,9 +295,9 @@ bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
for ( i = 0; i < val.Length(); i++) for ( i = 0; i < val.Length(); i++)
{ {
if (m_excludeList.Member((wxString) val[i])) if (m_excludeList.Member((wxString) val[i]))
return FALSE; return false;
} }
return TRUE; return true;
} }
#endif #endif

170
src/common/variant.cpp
View File

@@ -143,12 +143,12 @@ bool wxVariantDataList::Eq(wxVariantData& data) const
wxVariant* var1 = (wxVariant*) node1->GetData(); wxVariant* var1 = (wxVariant*) node1->GetData();
wxVariant* var2 = (wxVariant*) node2->GetData(); wxVariant* var2 = (wxVariant*) node2->GetData();
if ((*var1) != (*var2)) if ((*var1) != (*var2))
return FALSE; return false;
node1 = node1->GetNext(); node1 = node1->GetNext();
node2 = node2->GetNext(); node2 = node2->GetNext();
} }
if (node1 || node2) return FALSE; if (node1 || node2) return false;
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -157,7 +157,7 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const
wxString s; wxString s;
Write(s); Write(s);
str << (const char*) s.mb_str(); str << (const char*) s.mb_str();
return TRUE; return true;
} }
#endif #endif
@@ -175,7 +175,7 @@ bool wxVariantDataList::Write(wxString& str) const
node = node->GetNext(); node = node->GetNext();
} }
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -183,7 +183,7 @@ bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
{ {
wxFAIL_MSG(wxT("Unimplemented")); wxFAIL_MSG(wxT("Unimplemented"));
// TODO // TODO
return FALSE; return false;
} }
#endif #endif
@@ -191,7 +191,7 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str))
{ {
wxFAIL_MSG(wxT("Unimplemented")); wxFAIL_MSG(wxT("Unimplemented"));
// TODO // TODO
return FALSE; return false;
} }
/* /*
@@ -252,12 +252,12 @@ bool wxVariantDataStringList::Eq(wxVariantData& data) const
wxString str1 ( node1->GetData() ); wxString str1 ( node1->GetData() );
wxString str2 ( node2->GetData() ); wxString str2 ( node2->GetData() );
if (str1 != str2) if (str1 != str2)
return FALSE; return false;
node1 = node1->GetNext(); node1 = node1->GetNext();
node2 = node2->GetNext(); node2 = node2->GetNext();
} }
if (node1 || node2) return FALSE; if (node1 || node2) return false;
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -266,7 +266,7 @@ bool wxVariantDataStringList::Write(wxSTD ostream& str) const
wxString s; wxString s;
Write(s); Write(s);
str << (const char*) s.mb_str(); str << (const char*) s.mb_str();
return TRUE; return true;
} }
#endif #endif
@@ -283,7 +283,7 @@ bool wxVariantDataStringList::Write(wxString& str) const
node = node->GetNext(); node = node->GetNext();
} }
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -291,7 +291,7 @@ bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str))
{ {
wxFAIL_MSG(wxT("Unimplemented")); wxFAIL_MSG(wxT("Unimplemented"));
// TODO // TODO
return FALSE; return false;
} }
#endif #endif
@@ -299,7 +299,7 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
{ {
wxFAIL_MSG(wxT("Unimplemented")); wxFAIL_MSG(wxT("Unimplemented"));
// TODO // TODO
return FALSE; return false;
} }
/* /*
@@ -362,21 +362,21 @@ bool wxVariantDataLong::Write(wxSTD ostream& str) const
wxString s; wxString s;
Write(s); Write(s);
str << (const char*) s.mb_str(); str << (const char*) s.mb_str();
return TRUE; return true;
} }
#endif #endif
bool wxVariantDataLong::Write(wxString& str) const bool wxVariantDataLong::Write(wxString& str) const
{ {
str.Printf(wxT("%ld"), m_value); str.Printf(wxT("%ld"), m_value);
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
bool wxVariantDataLong::Read(wxSTD istream& str) bool wxVariantDataLong::Read(wxSTD istream& str)
{ {
str >> m_value; str >> m_value;
return TRUE; return true;
} }
#endif #endif
@@ -386,21 +386,21 @@ bool wxVariantDataLong::Write(wxOutputStream& str) const
wxTextOutputStream s(str); wxTextOutputStream s(str);
s.Write32((size_t)m_value); s.Write32((size_t)m_value);
return TRUE; return true;
} }
bool wxVariantDataLong::Read(wxInputStream& str) bool wxVariantDataLong::Read(wxInputStream& str)
{ {
wxTextInputStream s(str); wxTextInputStream s(str);
m_value = s.Read32(); m_value = s.Read32();
return TRUE; return true;
} }
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
bool wxVariantDataLong::Read(wxString& str) bool wxVariantDataLong::Read(wxString& str)
{ {
m_value = wxAtol((const wxChar*) str); m_value = wxAtol((const wxChar*) str);
return TRUE; return true;
} }
/* /*
@@ -463,21 +463,21 @@ bool wxVariantDataReal::Write(wxSTD ostream& str) const
wxString s; wxString s;
Write(s); Write(s);
str << (const char*) s.mb_str(); str << (const char*) s.mb_str();
return TRUE; return true;
} }
#endif #endif
bool wxVariantDataReal::Write(wxString& str) const bool wxVariantDataReal::Write(wxString& str) const
{ {
str.Printf(wxT("%.4f"), m_value); str.Printf(wxT("%.4f"), m_value);
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
bool wxVariantDataReal::Read(wxSTD istream& str) bool wxVariantDataReal::Read(wxSTD istream& str)
{ {
str >> m_value; str >> m_value;
return TRUE; return true;
} }
#endif #endif
@@ -486,21 +486,21 @@ bool wxVariantDataReal::Write(wxOutputStream& str) const
{ {
wxTextOutputStream s(str); wxTextOutputStream s(str);
s.WriteDouble((double)m_value); s.WriteDouble((double)m_value);
return TRUE; return true;
} }
bool wxVariantDataReal::Read(wxInputStream& str) bool wxVariantDataReal::Read(wxInputStream& str)
{ {
wxTextInputStream s(str); wxTextInputStream s(str);
m_value = (float)s.ReadDouble(); m_value = (float)s.ReadDouble();
return TRUE; return true;
} }
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
bool wxVariantDataReal::Read(wxString& str) bool wxVariantDataReal::Read(wxString& str)
{ {
m_value = wxAtof((const wxChar*) str); m_value = wxAtof((const wxChar*) str);
return TRUE; return true;
} }
#ifdef HAVE_BOOL #ifdef HAVE_BOOL
@@ -564,14 +564,14 @@ bool wxVariantDataBool::Write(wxSTD ostream& str) const
wxString s; wxString s;
Write(s); Write(s);
str << (const char*) s.mb_str(); str << (const char*) s.mb_str();
return TRUE; return true;
} }
#endif #endif
bool wxVariantDataBool::Write(wxString& str) const bool wxVariantDataBool::Write(wxString& str) const
{ {
str.Printf(wxT("%d"), (int) m_value); str.Printf(wxT("%d"), (int) m_value);
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -579,7 +579,7 @@ bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str))
{ {
wxFAIL_MSG(wxT("Unimplemented")); wxFAIL_MSG(wxT("Unimplemented"));
// str >> (long) m_value; // str >> (long) m_value;
return FALSE; return false;
} }
#endif #endif
@@ -589,7 +589,7 @@ bool wxVariantDataBool::Write(wxOutputStream& str) const
wxTextOutputStream s(str); wxTextOutputStream s(str);
s.Write8(m_value); s.Write8(m_value);
return TRUE; return true;
} }
bool wxVariantDataBool::Read(wxInputStream& str) bool wxVariantDataBool::Read(wxInputStream& str)
@@ -597,14 +597,14 @@ bool wxVariantDataBool::Read(wxInputStream& str)
wxTextInputStream s(str); wxTextInputStream s(str);
m_value = s.Read8() != 0; m_value = s.Read8() != 0;
return TRUE; return true;
} }
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
bool wxVariantDataBool::Read(wxString& str) bool wxVariantDataBool::Read(wxString& str)
{ {
m_value = (wxAtol((const wxChar*) str) != 0); m_value = (wxAtol((const wxChar*) str) != 0);
return TRUE; return true;
} }
#endif // HAVE_BOOL #endif // HAVE_BOOL
@@ -666,14 +666,14 @@ bool wxVariantDataChar::Write(wxSTD ostream& str) const
wxString s; wxString s;
Write(s); Write(s);
str << (const char*) s.mb_str(); str << (const char*) s.mb_str();
return TRUE; return true;
} }
#endif #endif
bool wxVariantDataChar::Write(wxString& str) const bool wxVariantDataChar::Write(wxString& str) const
{ {
str.Printf(wxT("%c"), m_value); str.Printf(wxT("%c"), m_value);
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -681,7 +681,7 @@ bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
{ {
wxFAIL_MSG(wxT("Unimplemented")); wxFAIL_MSG(wxT("Unimplemented"));
// str >> m_value; // str >> m_value;
return FALSE; return false;
} }
#endif #endif
@@ -691,7 +691,7 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const
wxTextOutputStream s(str); wxTextOutputStream s(str);
s.Write8(m_value); s.Write8(m_value);
return TRUE; return true;
} }
bool wxVariantDataChar::Read(wxInputStream& str) bool wxVariantDataChar::Read(wxInputStream& str)
@@ -699,14 +699,14 @@ bool wxVariantDataChar::Read(wxInputStream& str)
wxTextInputStream s(str); wxTextInputStream s(str);
m_value = s.Read8(); m_value = s.Read8();
return TRUE; return true;
} }
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
bool wxVariantDataChar::Read(wxString& str) bool wxVariantDataChar::Read(wxString& str)
{ {
m_value = str[(size_t)0]; m_value = str[(size_t)0];
return TRUE; return true;
} }
/* /*
@@ -765,21 +765,21 @@ bool wxVariantDataString::Eq(wxVariantData& data) const
bool wxVariantDataString::Write(wxSTD ostream& str) const bool wxVariantDataString::Write(wxSTD ostream& str) const
{ {
str << (const char*) m_value.mb_str(); str << (const char*) m_value.mb_str();
return TRUE; return true;
} }
#endif #endif
bool wxVariantDataString::Write(wxString& str) const bool wxVariantDataString::Write(wxString& str) const
{ {
str = m_value; str = m_value;
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
bool wxVariantDataString::Read(wxSTD istream& str) bool wxVariantDataString::Read(wxSTD istream& str)
{ {
str >> m_value; str >> m_value;
return TRUE; return true;
} }
#endif #endif
@@ -789,7 +789,7 @@ bool wxVariantDataString::Write(wxOutputStream& str) const
// why doesn't wxOutputStream::operator<< take "const wxString&" // why doesn't wxOutputStream::operator<< take "const wxString&"
wxTextOutputStream s(str); wxTextOutputStream s(str);
s.WriteString(m_value); s.WriteString(m_value);
return TRUE; return true;
} }
bool wxVariantDataString::Read(wxInputStream& str) bool wxVariantDataString::Read(wxInputStream& str)
@@ -797,14 +797,14 @@ bool wxVariantDataString::Read(wxInputStream& str)
wxTextInputStream s(str); wxTextInputStream s(str);
m_value = s.ReadString(); m_value = s.ReadString();
return TRUE; return true;
} }
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
bool wxVariantDataString::Read(wxString& str) bool wxVariantDataString::Read(wxString& str)
{ {
m_value = str; m_value = str;
return TRUE; return true;
} }
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData) IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
@@ -868,28 +868,28 @@ bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
wxString s; wxString s;
Write(s); Write(s);
str << (const char*) s.mb_str(); str << (const char*) s.mb_str();
return TRUE; return true;
} }
#endif #endif
bool wxVariantDataVoidPtr::Write(wxString& str) const bool wxVariantDataVoidPtr::Write(wxString& str) const
{ {
str.Printf(wxT("%ld"), (long) m_value); str.Printf(wxT("%ld"), (long) m_value);
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
{ {
// Not implemented // Not implemented
return FALSE; return false;
} }
#endif #endif
bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
{ {
// Not implemented // Not implemented
return FALSE; return false;
} }
/* /*
@@ -972,28 +972,28 @@ bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
wxString s; wxString s;
Write(s); Write(s);
str << (const char*) s.mb_str(); str << (const char*) s.mb_str();
return TRUE; return true;
} }
#endif #endif
bool wxVariantDataWxObjectPtr::Write(wxString& str) const bool wxVariantDataWxObjectPtr::Write(wxString& str) const
{ {
str.Printf(wxT("%s(%ld)"), GetType().c_str(), (long) m_value); str.Printf(wxT("%s(%ld)"), GetType().c_str(), (long) m_value);
return TRUE; return true;
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str)) bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str))
{ {
// Not implemented // Not implemented
return FALSE; return false;
} }
#endif #endif
bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str)) bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str))
{ {
// Not implemented // Not implemented
return FALSE; return false;
} }
@@ -1067,7 +1067,7 @@ bool wxVariantDataDateTime::Eq(wxVariantData& data) const
bool wxVariantDataDateTime::Write(wxSTD ostream& str) const bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
{ {
// Not implemented // Not implemented
return FALSE; return false;
} }
#endif #endif
@@ -1075,7 +1075,7 @@ bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
bool wxVariantDataDateTime::Write(wxString& str) const bool wxVariantDataDateTime::Write(wxString& str) const
{ {
str = m_value.Format(); str = m_value.Format();
return TRUE; return true;
} }
@@ -1083,7 +1083,7 @@ bool wxVariantDataDateTime::Write(wxString& str) const
bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
{ {
// Not implemented // Not implemented
return FALSE; return false;
} }
#endif #endif
@@ -1091,8 +1091,8 @@ bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
bool wxVariantDataDateTime::Read(wxString& str) bool wxVariantDataDateTime::Read(wxString& str)
{ {
if(! m_value.ParseDateTime(str)) if(! m_value.ParseDateTime(str))
return FALSE; return false;
return TRUE; return true;
} }
#endif // wxUSE_DATETIME #endif // wxUSE_DATETIME
@@ -1155,7 +1155,7 @@ bool wxVariantDataArrayString::Eq(wxVariantData& data) const
bool wxVariantDataArrayString::Write(wxSTD ostream& str) const bool wxVariantDataArrayString::Write(wxSTD ostream& str) const
{ {
// Not implemented // Not implemented
return FALSE; return false;
} }
#endif #endif
@@ -1171,7 +1171,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const
str += m_value[n]; str += m_value[n];
} }
return TRUE; return true;
} }
@@ -1179,7 +1179,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const
bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
{ {
// Not implemented // Not implemented
return FALSE; return false;
} }
#endif #endif
@@ -1192,7 +1192,7 @@ bool wxVariantDataArrayString::Read(wxString& str)
m_value.Add(tk.GetNextToken()); m_value.Add(tk.GetNextToken());
} }
return TRUE; return true;
} }
@@ -1386,7 +1386,7 @@ bool wxVariant::operator== (double value) const
{ {
double thisValue; double thisValue;
if (!Convert(&thisValue)) if (!Convert(&thisValue))
return FALSE; return false;
else else
return (value == thisValue); return (value == thisValue);
} }
@@ -1414,7 +1414,7 @@ bool wxVariant::operator== (long value) const
{ {
long thisValue; long thisValue;
if (!Convert(&thisValue)) if (!Convert(&thisValue))
return FALSE; return false;
else else
return (value == thisValue); return (value == thisValue);
} }
@@ -1442,7 +1442,7 @@ bool wxVariant::operator== (char value) const
{ {
char thisValue; char thisValue;
if (!Convert(&thisValue)) if (!Convert(&thisValue))
return FALSE; return false;
else else
return (value == thisValue); return (value == thisValue);
} }
@@ -1471,7 +1471,7 @@ bool wxVariant::operator== (bool value) const
{ {
bool thisValue; bool thisValue;
if (!Convert(&thisValue)) if (!Convert(&thisValue))
return FALSE; return false;
else else
return (value == thisValue); return (value == thisValue);
} }
@@ -1500,7 +1500,7 @@ bool wxVariant::operator== (const wxString& value) const
{ {
wxString thisValue; wxString thisValue;
if (!Convert(&thisValue)) if (!Convert(&thisValue))
return FALSE; return false;
return value == thisValue; return value == thisValue;
} }
@@ -1621,7 +1621,7 @@ bool wxVariant::operator== (const wxDateTime& value) const
{ {
wxDateTime thisValue; wxDateTime thisValue;
if (!Convert(&thisValue)) if (!Convert(&thisValue))
return FALSE; return false;
return value.IsEqualTo(thisValue); return value.IsEqualTo(thisValue);
} }
@@ -1676,7 +1676,7 @@ bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
{ {
wxFAIL_MSG( _T("TODO") ); wxFAIL_MSG( _T("TODO") );
return FALSE; return false;
} }
bool wxVariant::operator!=(const wxArrayString& value) const bool wxVariant::operator!=(const wxArrayString& value) const
@@ -1924,7 +1924,7 @@ void wxVariant::Insert(const wxVariant& value)
list.Insert(new wxVariant(value)); list.Insert(new wxVariant(value));
} }
// Returns TRUE if the variant is a member of the list // Returns true if the variant is a member of the list
bool wxVariant::Member(const wxVariant& value) const bool wxVariant::Member(const wxVariant& value) const
{ {
wxList& list = GetList(); wxList& list = GetList();
@@ -1934,10 +1934,10 @@ bool wxVariant::Member(const wxVariant& value) const
{ {
wxVariant* other = (wxVariant*) node->GetData(); wxVariant* other = (wxVariant*) node->GetData();
if (value == *other) if (value == *other)
return TRUE; return true;
node = node->GetNext(); node = node->GetNext();
} }
return FALSE; return false;
} }
// Deletes the nth element of the list // Deletes the nth element of the list
@@ -1950,7 +1950,7 @@ bool wxVariant::Delete(int item)
wxVariant* variant = (wxVariant*) node->GetData(); wxVariant* variant = (wxVariant*) node->GetData();
delete variant; delete variant;
list.Erase(node); list.Erase(node);
return TRUE; return true;
} }
// Clear list // Clear list
@@ -1986,9 +1986,9 @@ bool wxVariant::Convert(long* value) const
else if (type == wxT("string")) else if (type == wxT("string"))
*value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue()); *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
else else
return FALSE; return false;
return TRUE; return true;
} }
bool wxVariant::Convert(bool* value) const bool wxVariant::Convert(bool* value) const
@@ -2007,16 +2007,16 @@ bool wxVariant::Convert(bool* value) const
wxString val(((wxVariantDataString*)GetData())->GetValue()); wxString val(((wxVariantDataString*)GetData())->GetValue());
val.MakeLower(); val.MakeLower();
if (val == wxT("true") || val == wxT("yes")) if (val == wxT("true") || val == wxT("yes"))
*value = TRUE; *value = true;
else if (val == wxT("false") || val == wxT("no")) else if (val == wxT("false") || val == wxT("no"))
*value = FALSE; *value = false;
else else
return FALSE; return false;
} }
else else
return FALSE; return false;
return TRUE; return true;
} }
bool wxVariant::Convert(double* value) const bool wxVariant::Convert(double* value) const
@@ -2033,9 +2033,9 @@ bool wxVariant::Convert(double* value) const
else if (type == wxT("string")) else if (type == wxT("string"))
*value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue()); *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
else else
return FALSE; return false;
return TRUE; return true;
} }
bool wxVariant::Convert(char* value) const bool wxVariant::Convert(char* value) const
@@ -2050,15 +2050,15 @@ bool wxVariant::Convert(char* value) const
*value = (char) (((wxVariantDataBool*)GetData())->GetValue()); *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
#endif #endif
else else
return FALSE; return false;
return TRUE; return true;
} }
bool wxVariant::Convert(wxString* value) const bool wxVariant::Convert(wxString* value) const
{ {
*value = MakeString(); *value = MakeString();
return TRUE; return true;
} }
#if wxUSE_DATETIME #if wxUSE_DATETIME
@@ -2068,7 +2068,7 @@ bool wxVariant::Convert(wxDateTime* value) const
if (type == wxT("datetime")) if (type == wxT("datetime"))
{ {
*value = ((wxVariantDataDateTime*)GetData())->GetValue(); *value = ((wxVariantDataDateTime*)GetData())->GetValue();
return TRUE; return true;
} }
// Fallback to string conversion // Fallback to string conversion
wxString val; wxString val;

32
src/common/wfstream.cpp
View File

@@ -34,26 +34,26 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName)
: wxInputStream() : wxInputStream()
{ {
m_file = new wxFile(fileName, wxFile::read); m_file = new wxFile(fileName, wxFile::read);
m_file_destroy = TRUE; m_file_destroy = true;
} }
wxFileInputStream::wxFileInputStream() wxFileInputStream::wxFileInputStream()
: wxInputStream() : wxInputStream()
{ {
m_file_destroy = FALSE; m_file_destroy = false;
m_file = NULL; m_file = NULL;
} }
wxFileInputStream::wxFileInputStream(wxFile& file) wxFileInputStream::wxFileInputStream(wxFile& file)
{ {
m_file = &file; m_file = &file;
m_file_destroy = FALSE; m_file_destroy = false;
} }
wxFileInputStream::wxFileInputStream(int fd) wxFileInputStream::wxFileInputStream(int fd)
{ {
m_file = new wxFile(fd); m_file = new wxFile(fd);
m_file_destroy = TRUE; m_file_destroy = true;
} }
wxFileInputStream::~wxFileInputStream() wxFileInputStream::~wxFileInputStream()
@@ -110,7 +110,7 @@ off_t wxFileInputStream::OnSysTell() const
wxFileOutputStream::wxFileOutputStream(const wxString& fileName) wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
{ {
m_file = new wxFile(fileName, wxFile::write); m_file = new wxFile(fileName, wxFile::write);
m_file_destroy = TRUE; m_file_destroy = true;
if (!m_file->IsOpened()) if (!m_file->IsOpened())
{ {
@@ -126,20 +126,20 @@ wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
wxFileOutputStream::wxFileOutputStream(wxFile& file) wxFileOutputStream::wxFileOutputStream(wxFile& file)
{ {
m_file = &file; m_file = &file;
m_file_destroy = FALSE; m_file_destroy = false;
} }
wxFileOutputStream::wxFileOutputStream() wxFileOutputStream::wxFileOutputStream()
: wxOutputStream() : wxOutputStream()
{ {
m_file_destroy = FALSE; m_file_destroy = false;
m_file = NULL; m_file = NULL;
} }
wxFileOutputStream::wxFileOutputStream(int fd) wxFileOutputStream::wxFileOutputStream(int fd)
{ {
m_file = new wxFile(fd); m_file = new wxFile(fd);
m_file_destroy = TRUE; m_file_destroy = true;
} }
wxFileOutputStream::~wxFileOutputStream() wxFileOutputStream::~wxFileOutputStream()
@@ -199,26 +199,26 @@ wxFFileInputStream::wxFFileInputStream(const wxString& fileName)
: wxInputStream() : wxInputStream()
{ {
m_file = new wxFFile(fileName, _T("rb")); m_file = new wxFFile(fileName, _T("rb"));
m_file_destroy = TRUE; m_file_destroy = true;
} }
wxFFileInputStream::wxFFileInputStream() wxFFileInputStream::wxFFileInputStream()
: wxInputStream() : wxInputStream()
{ {
m_file_destroy = FALSE; m_file_destroy = false;
m_file = NULL; m_file = NULL;
} }
wxFFileInputStream::wxFFileInputStream(wxFFile& file) wxFFileInputStream::wxFFileInputStream(wxFFile& file)
{ {
m_file = &file; m_file = &file;
m_file_destroy = FALSE; m_file_destroy = false;
} }
wxFFileInputStream::wxFFileInputStream(FILE *file) wxFFileInputStream::wxFFileInputStream(FILE *file)
{ {
m_file = new wxFFile(file); m_file = new wxFFile(file);
m_file_destroy = TRUE; m_file_destroy = true;
} }
wxFFileInputStream::~wxFFileInputStream() wxFFileInputStream::~wxFFileInputStream()
@@ -272,7 +272,7 @@ off_t wxFFileInputStream::OnSysTell() const
wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName) wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
{ {
m_file = new wxFFile(fileName, _T("w+b")); m_file = new wxFFile(fileName, _T("w+b"));
m_file_destroy = TRUE; m_file_destroy = true;
if (!m_file->IsOpened()) if (!m_file->IsOpened())
{ {
@@ -288,20 +288,20 @@ wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
wxFFileOutputStream::wxFFileOutputStream(wxFFile& file) wxFFileOutputStream::wxFFileOutputStream(wxFFile& file)
{ {
m_file = &file; m_file = &file;
m_file_destroy = FALSE; m_file_destroy = false;
} }
wxFFileOutputStream::wxFFileOutputStream() wxFFileOutputStream::wxFFileOutputStream()
: wxOutputStream() : wxOutputStream()
{ {
m_file_destroy = FALSE; m_file_destroy = false;
m_file = NULL; m_file = NULL;
} }
wxFFileOutputStream::wxFFileOutputStream(FILE *file) wxFFileOutputStream::wxFFileOutputStream(FILE *file)
{ {
m_file = new wxFFile(file); m_file = new wxFFile(file);
m_file_destroy = TRUE; m_file_destroy = true;
} }
wxFFileOutputStream::~wxFFileOutputStream() wxFFileOutputStream::~wxFFileOutputStream()

16
src/common/wincmn.cpp
View File

@@ -490,7 +490,7 @@ void wxWindowBase::Centre(int direction)
} }
// move the window to this position (keeping the old size but using // move the window to this position (keeping the old size but using
// SetSize() and not Move() to allow xNew and/or yNew to be -1) // SetSize() and not Move() to allow xNew and/or yNew to be wxDefaultCoord)
SetSize(xNew, yNew, width, height, wxSIZE_ALLOW_MINUS_ONE); SetSize(xNew, yNew, width, height, wxSIZE_ALLOW_MINUS_ONE);
} }
@@ -2089,10 +2089,10 @@ wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt)
{ {
int charWidth = GetCharWidth(); int charWidth = GetCharWidth();
int charHeight = GetCharHeight(); int charHeight = GetCharHeight();
wxPoint pt2(-1, -1); wxPoint pt2 = wxDefaultPosition;
if (pt.x != -1) if (pt.x != wxDefaultCoord)
pt2.x = (int) ((pt.x * 4) / charWidth); pt2.x = (int) ((pt.x * 4) / charWidth);
if (pt.y != -1) if (pt.y != wxDefaultCoord)
pt2.y = (int) ((pt.y * 8) / charHeight); pt2.y = (int) ((pt.y * 8) / charHeight);
return pt2; return pt2;
@@ -2102,10 +2102,10 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
{ {
int charWidth = GetCharWidth(); int charWidth = GetCharWidth();
int charHeight = GetCharHeight(); int charHeight = GetCharHeight();
wxPoint pt2(-1, -1); wxPoint pt2 = wxDefaultPosition;
if (pt.x != -1) if (pt.x != wxDefaultCoord)
pt2.x = (int) ((pt.x * charWidth) / 4); pt2.x = (int) ((pt.x * charWidth) / 4);
if (pt.y != -1) if (pt.y != wxDefaultCoord)
pt2.y = (int) ((pt.y * charHeight) / 8); pt2.y = (int) ((pt.y * charHeight) / 8);
return pt2; return pt2;
@@ -2886,7 +2886,7 @@ wxAccStatus wxWindowAccessible::GetFocus(int* WXUNUSED(childId), wxAccessible**
// Gets a variant representing the selected children // Gets a variant representing the selected children
// of this object. // of this object.
// Acceptable values: // Acceptable values:
// - a null variant (IsNull() returns TRUE) // - a null variant (IsNull() returns true)
// - a list variant (GetType() == wxT("list") // - a list variant (GetType() == wxT("list")
// - an integer representing the selected child element, // - an integer representing the selected child element,
// or 0 if this object is selected (GetType() == wxT("long") // or 0 if this object is selected (GetType() == wxT("long")

38
src/common/wxchar.cpp
View File

@@ -130,11 +130,11 @@ bool WXDLLEXPORT wxOKlibc()
(strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) || (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) ||
(strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) { (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) {
// nope, don't use libc conversion // nope, don't use libc conversion
return FALSE; return false;
} }
} }
#endif #endif
return TRUE; return true;
} }
// ============================================================================ // ============================================================================
@@ -180,10 +180,10 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
{ {
static char s_szFlags[256] = "%"; static char s_szFlags[256] = "%";
size_t flagofs = 1; size_t flagofs = 1;
bool adj_left = FALSE, bool adj_left = false,
in_prec = FALSE, in_prec = false,
prec_dot = FALSE, prec_dot = false,
done = FALSE; done = false;
int ilen = 0; int ilen = 0;
size_t min_width = 0, size_t min_width = 0,
max_width = wxSTRING_MAXLEN; max_width = wxSTRING_MAXLEN;
@@ -194,7 +194,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
if (in_prec && !prec_dot) \ if (in_prec && !prec_dot) \
{ \ { \
s_szFlags[flagofs++] = '.'; \ s_szFlags[flagofs++] = '.'; \
prec_dot = TRUE; \ prec_dot = true; \
} }
#define APPEND_CH(ch) \ #define APPEND_CH(ch) \
@@ -220,12 +220,12 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
case wxT('\0'): case wxT('\0'):
APPEND_CH(_T('\0')); APPEND_CH(_T('\0'));
done = TRUE; done = true;
break; break;
case wxT('%'): case wxT('%'):
APPEND_CH(_T('%')); APPEND_CH(_T('%'));
done = TRUE; done = true;
break; break;
case wxT('#'): case wxT('#'):
@@ -239,14 +239,14 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
case wxT('-'): case wxT('-'):
CHECK_PREC CHECK_PREC
adj_left = TRUE; adj_left = true;
s_szFlags[flagofs++] = ch; s_szFlags[flagofs++] = ch;
break; break;
case wxT('.'): case wxT('.'):
CHECK_PREC CHECK_PREC
in_prec = TRUE; in_prec = true;
prec_dot = FALSE; prec_dot = false;
max_width = 0; max_width = 0;
// dot will be auto-added to s_szFlags if non-negative // dot will be auto-added to s_szFlags if non-negative
// number follows // number follows
@@ -372,7 +372,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
APPEND_STR(tmp); APPEND_STR(tmp);
} }
done = TRUE; done = true;
break; break;
case wxT('e'): case wxT('e'):
@@ -400,7 +400,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
APPEND_STR(tmp); APPEND_STR(tmp);
} }
done = TRUE; done = true;
break; break;
case wxT('p'): case wxT('p'):
@@ -415,7 +415,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
wxConvLibc.cMB2WX(szScratch); wxConvLibc.cMB2WX(szScratch);
APPEND_STR(tmp); APPEND_STR(tmp);
done = TRUE; done = true;
} }
break; break;
@@ -447,7 +447,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
for (i = 1; i < min_width; i++) for (i = 1; i < min_width; i++)
APPEND_CH(_T(' ')); APPEND_CH(_T(' '));
done = TRUE; done = true;
} }
break; break;
@@ -517,7 +517,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
for (i = len; i < min_width; i++) for (i = len; i < min_width; i++)
APPEND_CH(_T(' ')); APPEND_CH(_T(' '));
done = TRUE; done = true;
} }
break; break;
@@ -537,14 +537,14 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
long int *val = va_arg(argptr, long int *); long int *val = va_arg(argptr, long int *);
*val = lenCur; *val = lenCur;
} }
done = TRUE; done = true;
break; break;
default: default:
// bad format, leave unchanged // bad format, leave unchanged
APPEND_CH(_T('%')); APPEND_CH(_T('%'));
APPEND_CH(ch); APPEND_CH(ch);
done = TRUE; done = true;
break; break;
} }
} }