* updated wxPropGrid from to 1.4.14 to hopefully fix issues reported here: http://forums.codeblocks.org/index.php/topic,12362.msg88995.html#msg88995

git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@6570 2a5c6006-c6dd-42ca-98ab-0921f2732cef

Author: Martin Halle

src/sdk/wxpropgrid/README-wxPython.txt

@@ -3,7 +3,7 @@
 
     wxPropertyGrid for wxPython
 
-    Version:   1.4.12
+    Version:   1.4.14
 
       By Jaakko Salli ([email protected])
 

src/sdk/wxpropgrid/build/configure.ac

@@ -17,7 +17,7 @@
 # NOTE: you'll want to replace the first string in [] brackets with the name of your
 #       component, the second string with its version and third one with your mail
 #       (so that users will be able to contact you in case they have problems)
-AC_INIT([PROPGRID], [1.4.12], [[email protected]])
+AC_INIT([PROPGRID], [1.4.14], [[email protected]])
 AC_CONFIG_AUX_DIR(build)        # this is needed, don't touch it
 
 # ENABLES/DISABLES THE DEBUG MODE FOR THIS CONFIGURE SCRIPT

src/sdk/wxpropgrid/changes.txt

@@ -1,5 +1,54 @@
 
 
+Version 1.4.14 ( ?-?-2010 )
+
+  Bugs Fixed:
+
+  - wxPython Bindings: Custom properties did not properly support wxRect
+    as a value.
+
+
+
+Version 1.4.13 ( Aug-22-2010 )
+
+  New Features:
+
+  - Added two new validation failure behavior flags:
+      wxPG_VFB_SHOW_MESSAGEBOX and
+      wxPG_VFB_SHOW_MESSAGE_ON_STATUSBAR
+
+    These allow defining exactly how the message display behavior works,
+    unlike the old wxPG_VFB_SHOW_MESSAGE which had inconsistent (default)
+    behavior (see bug #3024332).
+
+  - wxPython Bindings: Python 2.7 is now supported.
+
+
+  Bugs Fixed:
+
+  - Linking the library could fail if the program used wxPGProperty::Hide().
+
+  - Property label editor blocked basically all other keyboard activity.
+
+  - Validation failure was not (always) reset when a valid value was
+    entered after an invalid one (see bug #3024332).
+
+  - Validation failure message for wxIntProperty's min/max constraints
+    was sometimes incorrect (see bug #3024332).
+
+  - Redundant validation failure message boxes should no longer be shown
+    (see bug #3024332).
+
+  - wxPython bindings: Fixed DateProperty value conversion. Month was
+    off by one and it did not accept datetime.date as input (only accepted
+    datetime.datetime).
+
+  - wxPython Bindings: ChildChanged() was not properly implemented, so it was
+    not possible to create custom properties with private children (i.e.
+    things similar to SizeProperty and FontProperty).
+
+
+
 Version 1.4.12 ( May-30-2010 )
 
   Bugs Fixed:

src/sdk/wxpropgrid/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for PROPGRID 1.4.12.
+# Generated by GNU Autoconf 2.59 for PROPGRID 1.4.14.
 #
 # Report bugs to <[email protected]>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='PROPGRID'
 PACKAGE_TARNAME='propgrid'
-PACKAGE_VERSION='1.4.12'
-PACKAGE_STRING='PROPGRID 1.4.12'
+PACKAGE_VERSION='1.4.14'
+PACKAGE_STRING='PROPGRID 1.4.14'
 PACKAGE_BUGREPORT='[email protected]'
 
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION_FULL WX_RESCOMP WX_VERSION_MAJOR WX_VERSION_MINOR WX_UNICODE WX_DEBUG WX_SHARED WX_PORT RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE MAKE_SET AR ac_ct_AR AROPTIONS STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING BK_DEPS WINDRES ac_ct_WINDRES REZ SETFILE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WINDOWS_IMPLIB_1 COND_WX_DEBUG_0 COND_WX_DEBUG_0_WX_UNICODE_1 COND_WX_DEBUG_1 COND_WX_DEBUG_1_WX_UNICODE_0 COND_WX_DEBUG_1_WX_UNICODE_1 COND_WX_SHARED_0 COND_WX_SHARED_1 LIBOBJS LTLIBOBJS'
@@ -746,7 +746,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PROPGRID 1.4.12 to adapt to many kinds of systems.
+\`configure' configures PROPGRID 1.4.14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -808,7 +808,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PROPGRID 1.4.12:";;
+     short | recursive ) echo "Configuration of PROPGRID 1.4.14:";;
    esac
   cat <<\_ACEOF
 
@@ -947,7 +947,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-PROPGRID configure 1.4.12
+PROPGRID configure 1.4.14
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -961,7 +961,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PROPGRID $as_me 1.4.12, which was
+It was created by PROPGRID $as_me 1.4.14, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -6134,7 +6134,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by PROPGRID $as_me 1.4.12, which was
+This file was extended by PROPGRID $as_me 1.4.14, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6189,7 +6189,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-PROPGRID config.status 1.4.12
+PROPGRID config.status 1.4.14
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

src/sdk/wxpropgrid/include/wx/propgrid/pg_dox_mainpage.h

@@ -13,7 +13,7 @@
 #define __WX_PG_DOX_MAINPAGE_H__
 
 /**
-    @mainpage wxPropertyGrid 1.4.12 Overview
+    @mainpage wxPropertyGrid 1.4.14 Overview
 
       wxPropertyGrid is a specialized for editing properties such as strings, numbers,
     flagsets, fonts, and colours. It allows hierarchial, collapsible properties (via

src/sdk/wxpropgrid/include/wx/propgrid/propdev.h

@@ -15,7 +15,7 @@
 // -----------------------------------------------------------------------
 
 
-class wxArrayEditorDialog;
+class WXDLLIMPEXP_PG wxArrayEditorDialog;
 
 // -----------------------------------------------------------------------
 

src/sdk/wxpropgrid/include/wx/propgrid/propgrid.h

@@ -84,7 +84,7 @@
 // for "configure" scripts under unix, use them.
 #define wxPROPGRID_MAJOR          1
 #define wxPROPGRID_MINOR          4
-#define wxPROPGRID_RELEASE        12
+#define wxPROPGRID_RELEASE        14
 
 // For non-Unix systems (i.e. when building without a configure script),
 // users of this component can use the following macro to check if the
@@ -454,6 +454,7 @@ class wxPGVariantAndBool
 // -----------------------------------------------------------------------
 
 #ifndef SWIG
+
 class WXDLLIMPEXP_PG wxPGEditor;
 class WXDLLIMPEXP_PG wxPGProperty;
 class WXDLLIMPEXP_PG wxPropertyCategory;
@@ -469,9 +470,11 @@ class WXDLLIMPEXP_PG wxPGOwnerDrawnComboBox;
 class WXDLLIMPEXP_PG wxPGCustomComboControl;
 class WXDLLIMPEXP_PG wxPGEditorDialogAdapter;
 
+class WXDLLIMPEXP_FWD_CORE wxStatusBar;
+
 extern WXDLLIMPEXP_PG const wxChar *wxPropertyGridNameStr;
 
-struct wxPGValidationInfo;
+struct WXDLLIMPEXP_PG wxPGValidationInfo;
 
 #endif // #ifndef SWIG
 
@@ -2251,8 +2254,22 @@ class WXDLLIMPEXP_PG wxPGProperty : public wxObject
     virtual wxPGVariantAndBool PyValidateValue( const wxVariant& value, wxPGValidationInfo& validationInfo ) const;
     virtual wxPGVariantAndBool PyStringToValue( const wxString& text, int argFlags = 0 ) const;
     virtual wxPGVariantAndBool PyIntToValue( int number, int argFlags = 0 ) const;
+    virtual wxVariant PyChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const;
 #endif
 
+    void ActualChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
+    {
+#ifdef __WXPYTHON__
+        if ( m_scriptObject )
+        {
+            thisValue = PyChildChanged(thisValue, childIndex, childValue);
+            return;
+        }
+#endif
+
+        ChildChanged(thisValue, childIndex, childValue);
+    }
+
     bool ActualValidateValue( wxVariant& value, wxPGValidationInfo& validationInfo ) const
     {
 #ifdef __WXPYTHON__
@@ -2852,7 +2869,7 @@ class WXDLLIMPEXP_PG wxPGProperty : public wxObject
         @param flags
         By default changes are applied recursively. Set this paramter wxPG_DONT_RECURSE to prevent this.
     */
-    inline bool Hide( bool hide, int flags = wxPG_RECURSE );
+    bool Hide( bool hide, int flags = wxPG_RECURSE );
 
     bool IsExpanded() const { return (!(m_flags & wxPG_PROP_COLLAPSED) && GetChildCount()); }
 
@@ -4303,10 +4320,26 @@ wxPG_VFB_BEEP                       = 0x02,
 */
 wxPG_VFB_MARK_CELL                  = 0x04,
 
-/** Display customizable text message explaining the situation.
+/** Display a customizable text message explaining the situation. 
+
+    To customize the way the message is displayed, you need to
+    reimplement wxPropertyGrid::DoShowPropertyError() in a
+    derived class. Default behavior is to display the text on
+    the top-level frame's status bar, if present, and otherwise
+    using wxMessageBox.
 */
 wxPG_VFB_SHOW_MESSAGE               = 0x08,
 
+/** Similar to wxPG_VFB_SHOW_MESSAGE, except always display the
+    message using wxMessageBox.
+*/
+wxPG_VFB_SHOW_MESSAGEBOX           = 0x10,
+
+/** Similar to wxPG_VFB_SHOW_MESSAGE, except always display the
+    message on the status bar.
+*/
+wxPG_VFB_SHOW_MESSAGE_ON_STATUSBAR = 0x20,
+
 /** Defaults. */
 wxPG_VFB_DEFAULT                    = wxPG_VFB_STAY_IN_PROPERTY|wxPG_VFB_BEEP,
 
@@ -4327,7 +4360,7 @@ wxPG_VFB_UNDEFINED                  = 0x80
     Used to convey validation information to and from functions that
     actually perform validation.
 */
-struct wxPGValidationInfo
+struct WXDLLIMPEXP_PG wxPGValidationInfo
 {
     /** Value to be validated.
     */
@@ -4341,6 +4374,19 @@ struct wxPGValidationInfo
     */
     wxPGVFBFlags    m_failureBehavior;
 
+    /** @true when validation is failing. */
+    bool            m_isFailing;
+
+    wxPGValidationInfo()
+    {
+        m_failureBehavior = 0;
+        m_isFailing = false;
+    }
+
+    ~wxPGValidationInfo()
+    {
+    }
+
     wxPGVFBFlags GetFailureBehavior() const { return m_failureBehavior; }
 
     void SetFailureBehavior(wxPGVFBFlags failureBehavior) { m_failureBehavior = failureBehavior; }
@@ -7576,6 +7622,38 @@ class WXDLLIMPEXP_PG wxPropertyGrid : public wxScrolledWindow, public wxProperty
     void SetInternalFlag( long flag ) { m_iFlags |= flag; }
     void ClearInternalFlag( long flag ) { m_iFlags &= ~(flag); }
 
+    /**
+        Override in derived class to display error messages in custom manner
+        (these message usually only result from validation failure).
+
+        @remarks If you implement this, then you also need to implement
+                 DoHidePropertyError() - possibly to do nothing, if error
+                 does not need hiding (e.g. it was logged or shown in a
+                 message box).
+
+        @see DoHidePropertyError()
+    */
+    virtual void DoShowPropertyError( wxPGProperty* property,
+                                      const wxString& msg );
+
+    /**
+        Override in derived class to hide an error displayed by
+        DoShowPropertyError().
+
+        @see DoShowPropertyError()
+    */
+    virtual void DoHidePropertyError( wxPGProperty* property );
+
+#if wxUSE_STATUSBAR
+    /**
+        Return wxStatusBar that is used by this wxPropertyGrid. You can
+        reimplement this member function in derived class to override
+        the default behavior of using the top-level wxFrame's status
+        bar, if any.
+    */
+    virtual wxStatusBar* GetStatusBar();
+#endif
+
 #ifndef SWIG
 
     /** Generates contents for string dst based on the convetents of wxArrayString
@@ -7674,11 +7752,6 @@ class WXDLLIMPEXP_PG wxPropertyGrid : public wxScrolledWindow, public wxProperty
         m_validationInfo.m_failureMessage.clear();
     }
 
-    /** Override in derived class to display error messages in custom manner
-        (these message usually only result from validation failure).
-    */
-    virtual void DoShowPropertyError( wxPGProperty* property, const wxString& msg );
-
     /** Override to customize property validation failure behavior.
         @param invalidValue
         Value which failed in validation.
@@ -7905,6 +7978,9 @@ class WXDLLIMPEXP_PG wxPropertyGrid : public wxScrolledWindow, public wxProperty
     /** 1 if in DoSelectProperty() */
     bool                m_inDoSelectProperty;
 
+    /** @true if in OnValidationFailure() */
+    bool                m_inOnValidationFailure;
+
     wxPGVFBFlags        m_permanentValidationFailureBehavior;  // Set by app
 
     /** Internal flags - see wxPG_FL_XXX constants. */