projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relinquish the mouse capture when a dialog is about to be made modal to ensure that...
[wxWidgets.git]
/
include
/
wx
/
validate.h
diff --git
a/include/wx/validate.h
b/include/wx/validate.h
index 7bf0f2b1080e5c60746d4a3f153c95cbd7068fc3..83aa586093c3c82dc799b206d91bf2b3d8760347 100644
(file)
--- a/
include/wx/validate.h
+++ b/
include/wx/validate.h
@@
-6,24
+6,20
@@
// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_VALIDATE_H_
#define _WX_VALIDATE_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_VALIDATE_H_
#define _WX_VALIDATE_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "validate.h"
-#endif
-
#include "wx/defs.h"
#if wxUSE_VALIDATORS
#include "wx/event.h"
#include "wx/defs.h"
#if wxUSE_VALIDATORS
#include "wx/event.h"
-class WXDLL
EXPORT
wxWindow;
-class WXDLL
EXPORT
wxWindowBase;
+class WXDLL
IMPEXP_FWD_CORE
wxWindow;
+class WXDLL
IMPEXP_FWD_CORE
wxWindowBase;
/*
A validator has up to three purposes:
/*
A validator has up to three purposes:
@@
-50,17
+46,17
@@
public:
virtual wxObject *Clone() const
{ return (wxValidator *)NULL; }
bool Copy(const wxValidator& val)
virtual wxObject *Clone() const
{ return (wxValidator *)NULL; }
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.
// This function can pop up an error message.
// Called when the value in the window must be validated.
// 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
wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; }
// accessors
wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; }
@@
-69,7
+65,7
@@
public:
// validators beep by default if invalid key is pressed, these functions
// allow to change it
static bool IsSilent() { return ms_isSilent; }
// validators beep by default if invalid key is pressed, these functions
// allow to change it
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:
wxWindowBase *m_validatorWindow;
protected:
wxWindowBase *m_validatorWindow;
@@
-81,7
+77,7
@@
private:
DECLARE_NO_COPY_CLASS(wxValidator)
};
DECLARE_NO_COPY_CLASS(wxValidator)
};
-
WXDLLEXPORT_DATA(extern
const wxValidator) wxDefaultValidator;
+
extern WXDLLEXPORT_DATA(
const wxValidator) wxDefaultValidator;
#define wxVALIDATOR_PARAM(val) val
#define wxVALIDATOR_PARAM(val) val
@@
-90,7
+86,7
@@
WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
// want to be able to pass wxDefaultValidator to the functions which take
// a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
// everywhere
// want to be able to pass wxDefaultValidator to the functions which take
// a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
// everywhere
- class WXDLL
EXPORT
wxValidator;
+ class WXDLL
IMPEXP_FWD_CORE
wxValidator;
#define wxDefaultValidator (*((wxValidator *)NULL))
// this macro allows to avoid warnings about unused parameters when
#define wxDefaultValidator (*((wxValidator *)NULL))
// this macro allows to avoid warnings about unused parameters when