X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..0e0d594d1abd1818f59ff7b16be828b16fe11d50:/include/wx/mac/listbox.h?ds=sidebyside

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index 3608f7eb32..d1ca11ca7a 100644
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -6,14 +6,14 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "listbox.h"
 #endif
 
@@ -94,7 +94,7 @@ public:
     virtual void* DoGetItemClientData(int n) const;
     virtual void DoSetItemClientObject(int n, wxClientData* clientData);
     virtual wxClientData* DoGetItemClientObject(int n) const;
-    virtual void  	 DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ;
+    virtual void       DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ;
 
     // wxCheckListBox support
 #if wxUSE_OWNER_DRAWN
@@ -111,8 +111,8 @@ public:
     // Windows callbacks
 
     virtual void    SetupColours();
-    virtual void    MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
-   	virtual bool MacCanFocus() const { return true ; }
+    virtual void    MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+       virtual bool MacCanFocus() const { return true ; }
     void OnChar(wxKeyEvent& event);
 
     void*           m_macList ;
@@ -123,9 +123,9 @@ public:
 protected:
     void            MacDestroy() ;
     void            MacDelete( int n ) ;
-    void            MacInsert( int n , const char * text) ;
-    void            MacAppend( const char * text) ;
-    void            MacSet( int n , const char *text ) ;
+    void            MacInsert( int n , const wxString& item) ;
+    void            MacAppend( const wxString& item) ;
+    void            MacSet( int n , const wxString& item ) ;
     void            MacClear() ;
     void            MacSetSelection( int n , bool select ) ;
     int             MacGetSelection() const ;
@@ -145,8 +145,8 @@ protected:
 
     int m_noItems;
     int m_selected;
-	wxString  m_typeIn ;
-	long      m_lastTypeIn ;
+    wxString  m_typeIn ;
+    long      m_lastTypeIn ;
 
     virtual wxSize DoGetBestSize() const;