X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4e41ce37ac7bcb43663241439cee68ebeff7ffc..f148f2bac3fb0fa6d984050fb940112da150aeff:/include/wx/mac/choice.h?ds=sidebyside

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 86419c148b..26ac3359c0 100644
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "choice.h"
 #endif
 
@@ -57,6 +57,7 @@ public:
 
   // implement base class pure virtuals
   virtual int DoAppend(const wxString& item);
+  virtual int DoInsert(const wxString& item, int pos);
   virtual void Delete(int n);
   virtual void Clear();
 
@@ -67,31 +68,18 @@ public:
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual void SetString( int , const wxString& s ) ;
-    void        MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
-
-/*
-  virtual void Append(const wxString& item);
-  // Added min Append and GetClientData
-  virtual void Append(const wxString& item, void *client_data);
-  virtual void *GetClientData(int index) const;
-  virtual inline void Select( int n ) { SetSelection( n ); }
-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  virtual wxString GetStringSelection() const ;
-  virtual bool SetStringSelection(const wxString& sel);
-
-  // Mac specific
-  virtual void Command(wxCommandEvent& event);
-  void        MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
-
-  virtual inline int GetColumns() const { return 1 ; };
-*/
+    void        MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+
 protected:
     virtual wxSize DoGetBestSize() const ;
+
+public: // for wxComboBox only
     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;
 
+protected:
     // free all memory we have (used by Clear() and dtor)
     // prevent collision with some BSD definitions of macro Free()   
     void FreeData();