don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 5a2c37493e95c79e168e95cda23624270da8fa91..29d257b336577747c99f8524c37bedbb4cd45012 100644 (file)
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -74,6 +74,7 @@ public:
     wxPGCachedString    m_strbool;
     wxPGCachedString    m_strlist;
 
     wxPGCachedString    m_strbool;
     wxPGCachedString    m_strlist;
 

+    wxPGCachedString    m_strDefaultValue;

     wxPGCachedString    m_strMin;
     wxPGCachedString    m_strMax;
     wxPGCachedString    m_strUnits;
     wxPGCachedString    m_strMin;
     wxPGCachedString    m_strMax;
     wxPGCachedString    m_strUnits;


@@ -87,9 +88,7 @@ public:
 
     int                 m_extraStyle;  // global extra style
 
 
     int                 m_extraStyle;  // global extra style
 

-#ifdef __WXDEBUG__

     int                 m_warnings;
     int                 m_warnings;

-#endif

 
     int HasExtraStyle( int style ) const { return (m_extraStyle & style); }
 };
 
     int HasExtraStyle( int style ) const { return (m_extraStyle & style); }
 };


@@ -104,6 +103,10 @@ extern WXDLLIMPEXP_PROPGRID wxPGGlobalVarsClass* wxPGGlobalVars;
 
 #define wxPGVariant_Bool(A)     (A?wxPGVariant_True:wxPGVariant_False)
 
 
 #define wxPGVariant_Bool(A)     (A?wxPGVariant_True:wxPGVariant_False)
 

+// When wxPG is loaded dynamically after the application is already running
+// then the built-in module system won't pick this one up.  Add it manually.
+WXDLLIMPEXP_PROPGRID void wxPGInitResourceModule();
+

 #endif // !SWIG
 
 // -----------------------------------------------------------------------
 #endif // !SWIG
 
 // -----------------------------------------------------------------------


@@ -581,30 +584,10 @@ class WXDLLIMPEXP_PROPGRID
     friend class wxPropertyGridManager;
     friend class wxPGCanvas;
 
     friend class wxPropertyGridManager;
     friend class wxPGCanvas;
 

-#ifndef SWIG

     DECLARE_DYNAMIC_CLASS(wxPropertyGrid)
     DECLARE_DYNAMIC_CLASS(wxPropertyGrid)

-#endif

 public:
 
 public:
 

-#ifdef SWIG
-    %pythonAppend wxPropertyGrid {
-        self._setOORInfo(self)
-        self.DoDefaultTypeMappings()
-        self.edited_objects = {}
-        self.DoDefaultValueTypeMappings()
-        if not hasattr(self.__class__,'_vt2setter'):
-            self.__class__._vt2setter = {}
-    }
-    %pythonAppend wxPropertyGrid() ""
-
-    wxPropertyGrid( wxWindow *parent, wxWindowID id = wxID_ANY,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxPG_DEFAULT_STYLE,
-                    const wxChar* name = wxPyPropertyGridNameStr );
-    %RenameCtor(PrePropertyGrid,  wxPropertyGrid());
-#else
-
+#ifndef SWIG

     /**
         Two step constructor.
 
     /**
         Two step constructor.
 


@@ -612,6 +595,7 @@ public:
         wxPropertyGrid
     */
     wxPropertyGrid();
         wxPropertyGrid
     */
     wxPropertyGrid();

+#endif

 
     /** The default constructor. The styles to be used are styles valid for
         the wxWindow and wxScrolledWindow.
 
     /** The default constructor. The styles to be used are styles valid for
         the wxWindow and wxScrolledWindow.


@@ -626,7 +610,6 @@ public:
 
     /** Destructor */
     virtual ~wxPropertyGrid();
 
     /** Destructor */
     virtual ~wxPropertyGrid();

-#endif

 
     /** Adds given key combination to trigger given action.
 
 
     /** Adds given key combination to trigger given action.
 


@@ -880,15 +863,24 @@ public:
     /** Returns current vertical spacing. */
     int GetVerticalSpacing() const { return (int)m_vspacing; }
 
     /** Returns current vertical spacing. */
     int GetVerticalSpacing() const { return (int)m_vspacing; }
 

+    /**
+        Returns @true if a property editor control has focus.
+    */
+    bool IsEditorFocused() const;
+

     /** Returns true if editor's value was marked modified.
     */
     bool IsEditorsValueModified() const
         { return  ( m_iFlags & wxPG_FL_VALUE_MODIFIED ) ? true : false; }
 
     /** Returns true if editor's value was marked modified.
     */
     bool IsEditorsValueModified() const
         { return  ( m_iFlags & wxPG_FL_VALUE_MODIFIED ) ? true : false; }
 

-    /** Returns information about arbitrary position in the grid.
+    /**
+        Returns information about arbitrary position in the grid.

 
 

-        For wxPropertyGridHitTestResult definition, see
-        wxPropertyGridPageState::HitTest().
+        @param pt
+            Coordinates in the virtual grid space. You may need to use
+            wxScrolledWindow::CalcScrolledPosition() for translating
+            wxPropertyGrid client coordinates into something this member
+            function can use.

     */
     wxPropertyGridHitTestResult HitTest( const wxPoint& pt ) const;
 
     */
     wxPropertyGridHitTestResult HitTest( const wxPoint& pt ) const;
 


@@ -901,6 +893,20 @@ public:
      */
     bool IsFrozen() const { return (m_frozen>0)?true:false; }
 
      */
     bool IsFrozen() const { return (m_frozen>0)?true:false; }
 

+    /**
+        Call this any time your code causes wxPropertyGrid's top-level parent
+        to change.
+
+        @param newTLP
+            New top-level parent that is about to be set. Old top-level parent
+            window should still exist as the current one.
+
+        @remarks This function is automatically called from wxPropertyGrid::
+                 Reparent() and wxPropertyGridManager::Reparent(). You only
+                 need to use it if you reparent wxPropertyGrid indirectly.
+    */
+    void OnTLPChanging( wxWindow* newTLP );
+

     /** Redraws given property.
     */
     virtual void RefreshProperty( wxPGProperty* p );
     /** Redraws given property.
     */
     virtual void RefreshProperty( wxPGProperty* p );


@@ -911,7 +917,14 @@ public:
         Pointer to the editor class instance that should be used.
     */
     static wxPGEditor* RegisterEditorClass( wxPGEditor* editor,
         Pointer to the editor class instance that should be used.
     */
     static wxPGEditor* RegisterEditorClass( wxPGEditor* editor,

-                                            bool noDefCheck = false );
+                                            bool noDefCheck = false )
+    {
+        return DoRegisterEditorClass(editor, wxEmptyString, noDefCheck);
+    }
+
+    static wxPGEditor* DoRegisterEditorClass( wxPGEditor* editorClass,
+                                              const wxString& editorName,
+                                              bool noDefCheck = false );

 #endif
 
     /** Resets all colours to the original system values.
 #endif
 
     /** Resets all colours to the original system values.


@@ -1349,6 +1362,21 @@ public:
 
     virtual void SetWindowStyleFlag( long style );
 
 
     virtual void SetWindowStyleFlag( long style );
 

+    void DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 );
+
+    void DrawItem( wxPGProperty* p )
+    {
+        DrawItems(p,p);
+    }
+
+    virtual void DrawItemAndChildren( wxPGProperty* p );
+
+    /**
+        Draws item, children, and consequtive parents as long as category is
+        not met.
+     */
+    void DrawItemAndValueRelated( wxPGProperty* p );
+

 protected:
 
     /**
 protected:
 
     /**


@@ -1409,7 +1437,7 @@ public:
     virtual void Freeze();
     virtual void SetExtraStyle( long exStyle );
     virtual void Thaw();
     virtual void Freeze();
     virtual void SetExtraStyle( long exStyle );
     virtual void Thaw();

-
+    virtual bool Reparent( wxWindowBase *newParent );

 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;


@@ -1599,10 +1627,7 @@ protected:
     // handling mess).
     wxWindow*           m_curFocused;
 
     // handling mess).
     wxWindow*           m_curFocused;
 

-    // wxPGTLWHandler
-    wxEvtHandler*       m_tlwHandler;
-
-    // Top level parent
+    // Last known top-level parent

     wxWindow*           m_tlp;
 
     // Sort function
     wxWindow*           m_tlp;
 
     // Sort function


@@ -1708,6 +1733,8 @@ protected:
 
     void OnSysColourChanged( wxSysColourChangedEvent &event );
 
 
     void OnSysColourChanged( wxSysColourChangedEvent &event );
 

+    void OnTLPClose( wxCloseEvent& event );
+

 protected:
 
     /**
 protected:
 
     /**


@@ -1729,11 +1756,6 @@ protected:
     */
     void CorrectEditorWidgetPosY();
 
     */
     void CorrectEditorWidgetPosY();
 

-#ifdef __WXDEBUG__
-    void _log_items();
-    void OnScreenNote( const wxChar* format, ... );
-#endif
-

     /** Deselect current selection, if any. Returns true if success
         (ie. validator did not intercept). */
     bool DoClearSelection();
     /** Deselect current selection, if any. Returns true if success
         (ie. validator did not intercept). */
     bool DoClearSelection();


@@ -1751,21 +1773,6 @@ protected:
     void DrawItems( wxDC& dc, unsigned int topitemy, unsigned int bottomitemy,
                     const wxRect* clip_rect = (const wxRect*) NULL );
 
     void DrawItems( wxDC& dc, unsigned int topitemy, unsigned int bottomitemy,
                     const wxRect* clip_rect = (const wxRect*) NULL );
 

-    void DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 );
-
-    void DrawItem( wxPGProperty* p )
-    {
-        DrawItems(p,p);
-    }
-
-    virtual void DrawItemAndChildren( wxPGProperty* p );
-
-    /**
-        Draws item, children, and consequtive parents as long as category is
-        not met.
-     */
-    void DrawItemAndValueRelated( wxPGProperty* p );
-

     // Translate wxKeyEvent to wxPG_ACTION_XXX
     int KeyEventToActions(wxKeyEvent &event, int* pSecond) const;
 
     // Translate wxKeyEvent to wxPG_ACTION_XXX
     int KeyEventToActions(wxKeyEvent &event, int* pSecond) const;
 


@@ -1776,9 +1783,6 @@ protected:
 
     void ImprovedClientToScreen( int* px, int* py );
 
 
     void ImprovedClientToScreen( int* px, int* py );
 

-    // Returns True if editor control has focus
-    bool IsEditorFocused() const;
-

     // Called by focus event handlers. newFocused is the window that becomes
     // focused.
     void HandleFocusChange( wxWindow* newFocused );
     // Called by focus event handlers. newFocused is the window that becomes
     // focused.
     void HandleFocusChange( wxWindow* newFocused );


@@ -1866,6 +1870,11 @@ inline int wxPGProperty::GetDisplayedCommonValueCount() const
     return 0;
 }
 
     return 0;
 }
 

+inline void wxPGProperty::SetDefaultValue( wxVariant& value )
+{
+    SetAttribute(wxPG_ATTR_DEFAULT_VALUE, value);
+}
+

 inline void wxPGProperty::SetEditor( const wxString& editorName )
 {
     m_customEditor = wxPropertyGridInterface::GetEditorByName(editorName);
 inline void wxPGProperty::SetEditor( const wxString& editorName )
 {
     m_customEditor = wxPropertyGridInterface::GetEditorByName(editorName);