avoid a bug in Carbon headers

[wxWidgets.git] / include / wx / motif / listbox.h

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 506dfbf2c057534f2b8eae8454426067cecfbcf1..93a3fac24cd9ad5832297c4115c6a1194364aabb 100644 (file)
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -12,19 +12,16 @@
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 

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

 #pragma interface "listbox.h"
 #endif
 
 #include "wx/ctrlsub.h"
 #pragma interface "listbox.h"
 #endif
 
 #include "wx/ctrlsub.h"

-
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
+#include "wx/clntdata.h"

 
 // forward decl for GetSelections()
 class WXDLLEXPORT wxArrayInt;
 
 
 // forward decl for GetSelections()
 class WXDLLEXPORT wxArrayInt;
 

-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-

 // List box item
 class WXDLLEXPORT wxListBox: public wxListBoxBase
 {
 // List box item
 class WXDLLEXPORT wxListBox: public wxListBoxBase
 {


@@ -38,8 +35,7 @@ public:
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,

-        const wxString& name = wxListBoxNameStr):
-        m_clientDataList(wxKEY_INTEGER)
+        const wxString& name = wxListBoxNameStr)

     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }


@@ -57,10 +53,10 @@ public:
     // implementation of wxControlWithItems
     virtual int GetCount() const;
     virtual int DoAppend(const wxString& item);
     // implementation of wxControlWithItems
     virtual int GetCount() const;
     virtual int DoAppend(const wxString& item);

-    virtual void DoSetItemClientData(int n, void* clientData); //
-    virtual void* DoGetItemClientData(int n) const; //
-    virtual void DoSetItemClientObject(int n, wxClientData* clientData); //
-    virtual wxClientData* DoGetItemClientObject(int n) const; //
+    virtual void DoSetItemClientData(int n, void* clientData);
+    virtual void* DoGetItemClientData(int n) const;
+    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(int n) const;

     virtual int GetSelection() const;
     virtual void Delete(int n);
     virtual int FindString(const wxString& s) const;
     virtual int GetSelection() const;
     virtual void Delete(int n);
     virtual int FindString(const wxString& s) const;


@@ -80,7 +76,6 @@ public:
     void Command(wxCommandEvent& event);
     
     // Implementation
     void Command(wxCommandEvent& event);
     
     // Implementation

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);

     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const;
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const;


@@ -89,14 +84,14 @@ public:
     virtual void DoToggleItem(int item, int x) {};
 #endif
 protected:
     virtual void DoToggleItem(int item, int x) {};
 #endif
 protected:

+    virtual wxSize DoGetBestSize() const;
+

     int       m_noItems;
     
     // List mapping positions->client data
     int       m_noItems;
     
     // List mapping positions->client data

-    wxList    m_clientDataList;
-    
-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
+    wxClientDataDictionary m_clientDataDict;
+private:
+    void SetSelectionPolicy();

 };
 
 #endif
 };
 
 #endif