Compile fixes

[wxWidgets.git] / contrib / include / wx / gizmos / editlbox.h

diff --git a/contrib/include/wx/gizmos/editlbox.h b/contrib/include/wx/gizmos/editlbox.h
index 43e339d8d7a817945c3145c6edfa8ef4b12b8c3b..5674b08cb4254641c566271d1a0d24655d23e578 100644 (file)
--- a/contrib/include/wx/gizmos/editlbox.h
+++ b/contrib/include/wx/gizmos/editlbox.h
@@ -11,27 +11,25 @@
 #ifndef __WX_EDITLBOX_H__
 #define __WX_EDITLBOX_H__
 
 #ifndef __WX_EDITLBOX_H__
 #define __WX_EDITLBOX_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

        #pragma interface "editlbox.h"
 #endif
 
 #include "wx/panel.h"
        #pragma interface "editlbox.h"
 #endif
 
 #include "wx/panel.h"

-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
+#include "wx/gizmos/gizmos.h"

 
 class WXDLLEXPORT wxBitmapButton;
 class WXDLLEXPORT wxListCtrl;
 class WXDLLEXPORT wxListEvent;
 
 
 class WXDLLEXPORT wxBitmapButton;
 class WXDLLEXPORT wxListCtrl;
 class WXDLLEXPORT wxListEvent;
 

+#define wxEL_ALLOW_NEW          0x0100
+#define wxEL_ALLOW_EDIT         0x0200
+#define wxEL_ALLOW_DELETE       0x0400
+

 // This class provides a composite control that lets the
 // user easily enter list of strings
 
 // This class provides a composite control that lets the
 // user easily enter list of strings
 

-class GIZMODLLEXPORT wxEditableListBox : public wxPanel
+class WXDLLIMPEXP_GIZMOS wxEditableListBox : public wxPanel

 {
        DECLARE_CLASS(wxEditableListBox);
 
 {
        DECLARE_CLASS(wxEditableListBox);
 


@@ -40,16 +38,24 @@ public:
                       const wxString& label,
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       const wxString& label,
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,

+                      long style = wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE,

                       const wxString& name = wxT("editableListBox"));
 
     void SetStrings(const wxArrayString& strings);
     void GetStrings(wxArrayString& strings);
 
                       const wxString& name = wxT("editableListBox"));
 
     void SetStrings(const wxArrayString& strings);
     void GetStrings(wxArrayString& strings);
 

+    wxListCtrl* GetListCtrl()       { return m_listCtrl; }
+    wxBitmapButton* GetDelButton()  { return m_bDel; }
+    wxBitmapButton* GetNewButton()  { return m_bNew; }
+    wxBitmapButton* GetUpButton()   { return m_bUp; }
+    wxBitmapButton* GetDownButton() { return m_bDown; }
+    wxBitmapButton* GetEditButton() { return m_bEdit; }
+

 protected:
     wxBitmapButton *m_bDel, *m_bNew, *m_bUp, *m_bDown, *m_bEdit;
     wxListCtrl *m_listCtrl;
     int m_selection;
 protected:
     wxBitmapButton *m_bDel, *m_bNew, *m_bUp, *m_bDown, *m_bEdit;
     wxListCtrl *m_listCtrl;
     int m_selection;

-    bool m_edittingNew;
+    long m_style;

 
     void OnItemSelected(wxListEvent& event);
     void OnEndLabelEdit(wxListEvent& event);
 
     void OnItemSelected(wxListEvent& event);
     void OnEndLabelEdit(wxListEvent& event);