X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/026767c6aee4c61b904fe68b79af186258fd6005..7ce6da52a1d67ebe79fac0d8add6ad8f19b38528:/include/wx/propgrid/props.h
diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index 84f7d5191c..5d5528e44a 100644
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -27,6 +27,7 @@ class wxPGArrayEditorDialog;
#include "wx/textctrl.h"
#include "wx/button.h"
#include "wx/listbox.h"
+#include "wx/valtext.h"
// -----------------------------------------------------------------------
@@ -93,7 +94,7 @@ private:
Basic property with string value.
Supported special attributes:
- - "Password": set to 1 inorder to enable wxTE_PASSWORD on the editor.
+ - "Password": set to 1 in order to enable wxTE_PASSWORD on the editor.
@remarks
- If value "" is set, then actual value is formed (or composed)
@@ -148,7 +149,7 @@ enum wxPGNumericValidationConstants
/**
A more comprehensive numeric validator class.
*/
-class wxNumericPropertyValidator : public wxTextValidator
+class WXDLLIMPEXP_PROPGRID wxNumericPropertyValidator : public wxTextValidator
{
public:
enum NumericType
@@ -516,7 +517,7 @@ protected:
@ingroup classes
Represents a bit set that fits in a long integer. wxBoolProperty
sub-properties are created for editing individual bits. Textctrl is created
- to manually edit the flags as a text; a continous sequence of spaces,
+ to manually edit the flags as a text; a continuous sequence of spaces,
commas and semicolons is considered as a flag id separator.
Note: When changing "choices" (ie. flag labels) of wxFlagsProperty,
you will need to use SetPropertyChoices - otherwise they will not get
@@ -563,7 +564,7 @@ public:
// helpers
size_t GetItemCount() const { return m_choices.GetCount(); }
const wxString& GetLabel( size_t ind ) const
- { return m_choices.GetLabel(ind); }
+ { return m_choices.GetLabel(static_cast(ind)); }
protected:
// Used to detect if choices have been changed
@@ -996,7 +997,7 @@ public:
void SetCustomButton( const wxString& custBtText,
wxArrayStringProperty* pcc )
{
- if ( custBtText.length() )
+ if ( !custBtText.empty() )
{
EnableCustomNewAction();
m_pCallingClass = pcc;