X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d5409f936104b4a3a1f1f67a36503083414466e..38534f596974042130716a26276e9564b0b72295:/interface/wx/propgrid/property.h

diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index 7ce40e5f90..506bfaa942 100644
--- a/interface/wx/propgrid/property.h
+++ b/interface/wx/propgrid/property.h
@@ -431,13 +431,8 @@ wxPG_PROP_BEING_DELETED             = 0x00200000
     @subsection wxBoolProperty
 
     Represents a boolean value. wxChoice is used as editor control, by the
-<<<<<<< .mine
     default. wxPG_BOOL_USE_CHECKBOX attribute can be set to true in order to
     use check box instead.
-=======
-    default. wxPG_BOOL_USE_CHECKBOX attribute can be set to true in order to use
-    check box instead.
->>>>>>> .r67279
 
     @subsection wxLongStringProperty
 
@@ -517,7 +512,7 @@ wxPG_PROP_BEING_DELETED             = 0x00200000
     wxDateTime property. Default editor is DatePickerCtrl, although TextCtrl
     should work as well. wxPG_DATE_FORMAT attribute can be used to change
     string wxDateTime::Format uses (although default is recommended as it is
-    locale-dependant), and wxPG_DATE_PICKER_STYLE allows changing window
+    locale-dependent), and wxPG_DATE_PICKER_STYLE allows changing window
     style given to DatePickerCtrl (default is wxDP_DEFAULT|wxDP_SHOWCENTURY).
     Using wxDP_ALLOWNONE will enable better unspecified value support.
 
@@ -842,13 +837,8 @@ public:
     bool SetValueFromString( const wxString& text, int flags = 0 );
 
     /**
-<<<<<<< .mine
         Converts integer to a value, and if successful, calls SetValue() on it.
         Default behaviour is to do nothing.
-=======
-        Converts integer to a value, and if successful, calls SetValue() on it.
-        Default behavior is to do nothing.
->>>>>>> .r67279
 
         @param value
             Int to get the value from.
@@ -879,7 +869,7 @@ public:
         usually processes most events. Some, such as button press events of
         TextCtrlAndButton class, can be handled here. Also, if custom handling
         for regular events is desired, then that can also be done (for example,
-        wxSystemColourProperty custom handles @c wxEVT_COMMAND_CHOICE_SELECTED
+        wxSystemColourProperty custom handles @c wxEVT_CHOICE
         to display colour picker dialog when 'custom' selection is made).
 
         If the event causes value to be changed, SetValueInEvent() should be called
@@ -1198,9 +1188,6 @@ public:
     */
     void DeleteChoice( int index );
 
-    /** Deletes all child properties. */
-    void Empty();
-
     /**
         Enables or disables the property. Disabled property usually appears
         as having grey text.
@@ -1758,6 +1745,10 @@ public:
         Returns @true if containing grid uses wxPG_EX_AUTO_UNSPECIFIED_VALUES.
     */
     bool UsesAutoUnspecified() const;
+
+protected:
+    /** Deletes all child properties. */
+    void Empty();
 };
 
 
@@ -1879,9 +1870,6 @@ public:
     */
     void Add( const wxChar** labels, const ValArrItem* values = NULL );
 
-    /** Version that works with wxArrayString. */
-    void Add( const wxArrayString& arr, const ValArrItem* values = NULL );
-
     /** Version that works with wxArrayString and wxArrayInt. */
     void Add( const wxArrayString& arr, const wxArrayInt& arrint );
 
@@ -1947,15 +1935,6 @@ public:
     wxArrayInt GetIndicesForStrings( const wxArrayString& strings,
                                      wxArrayString* unmatched = NULL ) const;
 
-    /** Returns property at given virtual y coordinate.
-    */
-    wxPGProperty* GetItemAtY( unsigned int y ) const;
-
-    /**
-        Returns @true if item at given index has a valid value;
-    */
-    bool HasValue( unsigned int i ) const;
-
     /**
         Returns index of item with given label.
     */