don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h
index 96298e2cc5f7445e344b2605e3b23383d6791164..37c22eb99ede3c22f07f467e0397132bad49ca22 100644 (file)
--- a/include/wx/propgrid/editors.h
+++ b/include/wx/propgrid/editors.h
@@ -75,9 +75,7 @@ public:
 */
 class WXDLLIMPEXP_PROPGRID wxPGEditor : public wxObject
 {
 */
 class WXDLLIMPEXP_PROPGRID wxPGEditor : public wxObject
 {

-#ifndef SWIG

     DECLARE_ABSTRACT_CLASS(wxPGEditor)
     DECLARE_ABSTRACT_CLASS(wxPGEditor)

-#endif

 public:
 
     /** Constructor. */
 public:
 
     /** Constructor. */


@@ -214,7 +212,7 @@ wxString CLASSNAME::GetName() const \
 { \
     return wxS(#EDITOR); \
 } \
 { \
     return wxS(#EDITOR); \
 } \

-wxPGEditor* wxPGEditor_##EDITOR = (wxPGEditor*) NULL;
+wxPGEditor* wxPGEditor_##EDITOR = NULL;

 
 
 //
 
 
 //


@@ -223,9 +221,7 @@ wxPGEditor* wxPGEditor_##EDITOR = (wxPGEditor*) NULL;
 
 class WXDLLIMPEXP_PROPGRID wxPGTextCtrlEditor : public wxPGEditor
 {
 
 class WXDLLIMPEXP_PROPGRID wxPGTextCtrlEditor : public wxPGEditor
 {

-#ifndef SWIG

     DECLARE_DYNAMIC_CLASS(wxPGTextCtrlEditor)
     DECLARE_DYNAMIC_CLASS(wxPGTextCtrlEditor)

-#endif

 public:
     wxPGTextCtrlEditor() {}
     virtual ~wxPGTextCtrlEditor();
 public:
     wxPGTextCtrlEditor() {}
     virtual ~wxPGTextCtrlEditor();


@@ -270,9 +266,7 @@ public:
 
 class WXDLLIMPEXP_PROPGRID wxPGChoiceEditor : public wxPGEditor
 {
 
 class WXDLLIMPEXP_PROPGRID wxPGChoiceEditor : public wxPGEditor
 {

-#ifndef SWIG

     DECLARE_DYNAMIC_CLASS(wxPGChoiceEditor)
     DECLARE_DYNAMIC_CLASS(wxPGChoiceEditor)

-#endif

 public:
     wxPGChoiceEditor() {}
     virtual ~wxPGChoiceEditor();
 public:
     wxPGChoiceEditor() {}
     virtual ~wxPGChoiceEditor();


@@ -319,9 +313,7 @@ public:
 
 class WXDLLIMPEXP_PROPGRID wxPGComboBoxEditor : public wxPGChoiceEditor
 {
 
 class WXDLLIMPEXP_PROPGRID wxPGComboBoxEditor : public wxPGChoiceEditor
 {

-#ifndef SWIG

     DECLARE_DYNAMIC_CLASS(wxPGComboBoxEditor)
     DECLARE_DYNAMIC_CLASS(wxPGComboBoxEditor)

-#endif

 public:
     wxPGComboBoxEditor() {}
     virtual ~wxPGComboBoxEditor();
 public:
     wxPGComboBoxEditor() {}
     virtual ~wxPGComboBoxEditor();


@@ -392,9 +384,7 @@ public:
 //
 class WXDLLIMPEXP_PROPGRID wxPGCheckBoxEditor : public wxPGEditor
 {
 //
 class WXDLLIMPEXP_PROPGRID wxPGCheckBoxEditor : public wxPGEditor
 {

-#ifndef SWIG

     DECLARE_DYNAMIC_CLASS(wxPGCheckBoxEditor)
     DECLARE_DYNAMIC_CLASS(wxPGCheckBoxEditor)

-#endif

 public:
     wxPGCheckBoxEditor() {}
     virtual ~wxPGCheckBoxEditor();
 public:
     wxPGCheckBoxEditor() {}
     virtual ~wxPGCheckBoxEditor();


@@ -434,7 +424,7 @@ public:
 // Editor class registeration macro (mostly for internal use)
 
 #define wxPGRegisterEditorClass(EDITOR) \
 // Editor class registeration macro (mostly for internal use)
 
 #define wxPGRegisterEditorClass(EDITOR) \

-    if ( wxPGEditor_##EDITOR == (wxPGEditor*) NULL ) \
+    if ( wxPGEditor_##EDITOR == NULL ) \

     { \
         wxPGEditor_##EDITOR = wxPropertyGrid::RegisterEditorClass( \
                 new wxPG##EDITOR##Editor ); \
     { \
         wxPGEditor_##EDITOR = wxPropertyGrid::RegisterEditorClass( \
                 new wxPG##EDITOR##Editor ); \


@@ -456,9 +446,7 @@ public:
 */
 class WXDLLIMPEXP_PROPGRID wxPGEditorDialogAdapter : public wxObject
 {
 */
 class WXDLLIMPEXP_PROPGRID wxPGEditorDialogAdapter : public wxObject
 {

-#ifndef SWIG

     DECLARE_ABSTRACT_CLASS(wxPGEditorDialogAdapter)
     DECLARE_ABSTRACT_CLASS(wxPGEditorDialogAdapter)

-#endif

 public:
     wxPGEditorDialogAdapter()
         : wxObject()
 public:
     wxPGEditorDialogAdapter()
         : wxObject()


@@ -507,6 +495,7 @@ class WXDLLIMPEXP_PROPGRID wxPGMultiButton : public wxWindow
 {
 public:
     wxPGMultiButton( wxPropertyGrid* pg, const wxSize& sz );
 {
 public:
     wxPGMultiButton( wxPropertyGrid* pg, const wxSize& sz );

+    virtual ~wxPGMultiButton() {}

 
     wxWindow* GetButton( unsigned int i ) { return (wxWindow*) m_buttons[i]; }
     const wxWindow* GetButton( unsigned int i ) const
 
     wxWindow* GetButton( unsigned int i ) { return (wxWindow*) m_buttons[i]; }
     const wxWindow* GetButton( unsigned int i ) const


@@ -534,6 +523,8 @@ public:
 
 protected:
 
 
 protected:
 

+    void DoAddButton( wxWindow* button, const wxSize& sz );
+

     int GenId( int id ) const;
 
     wxArrayPtrVoid  m_buttons;
     int GenId( int id ) const;
 
     wxArrayPtrVoid  m_buttons;