Extract OS X non-GUI event loop in a separate header.

[wxWidgets.git] / include / wx / propgrid / props.h

diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index 84f7d5191caf4caa03f6ff614fd1010ceb563bd3..5d5528e44ad81fae256b9963116feaef392e3934 100644 (file)
--- 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/textctrl.h"
 #include "wx/button.h"
 #include "wx/listbox.h"

+#include "wx/valtext.h"

 
 // -----------------------------------------------------------------------
 
 
 // -----------------------------------------------------------------------
 


@@ -93,7 +94,7 @@ private:
     Basic property with string value.
 
     <b>Supported special attributes:</b>
     Basic property with string value.
 
     <b>Supported special attributes:</b>

-    - "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 "<composed>" is set, then actual value is formed (or composed)
 
     @remarks
     - If value "<composed>" is set, then actual value is formed (or composed)


@@ -148,7 +149,7 @@ enum wxPGNumericValidationConstants
 /**
     A more comprehensive numeric validator class.
 */
 /**
     A more comprehensive numeric validator class.
 */

-class wxNumericPropertyValidator : public wxTextValidator
+class WXDLLIMPEXP_PROPGRID wxNumericPropertyValidator : public wxTextValidator

 {
 public:
     enum NumericType
 {
 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
     @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.
     <b>Note:</b> When changing "choices" (ie. flag labels) of wxFlagsProperty,
     you will need to use SetPropertyChoices - otherwise they will not get
     commas and semicolons is considered as a flag id separator.
     <b>Note:</b> 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
     // 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<int>(ind)); }

 
 protected:
     // Used to detect if choices have been changed
 
 protected:
     // Used to detect if choices have been changed


@@ -996,7 +997,7 @@ public:
     void SetCustomButton( const wxString& custBtText,
                           wxArrayStringProperty* pcc )
     {
     void SetCustomButton( const wxString& custBtText,
                           wxArrayStringProperty* pcc )
     {

-        if ( custBtText.length() )
+        if ( !custBtText.empty() )

         {
             EnableCustomNewAction();
             m_pCallingClass = pcc;
         {
             EnableCustomNewAction();
             m_pCallingClass = pcc;