Refactored & cleaned up wxChoice & wxComboBox code, fixed client data

[wxWidgets.git] / include / wx / mac / choice.h

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 335bebd869d45f520ddb1657301f8d1b6a0e98dc..a122f95f3787de5c490d02a646f515b0dedcdad7 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -12,13 +12,13 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

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

 #pragma interface "choice.h"
 #endif
 
 #include "wx/control.h"
 
 #pragma interface "choice.h"
 #endif
 
 #include "wx/control.h"
 

-  #include  <wx/dynarray.h>
+  #include  "wx/dynarray.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 


@@ -27,11 +27,14 @@ WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 // Choice item
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
 // Choice item
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {

-  DECLARE_DYNAMIC_CLASS(wxChoice)
+    DECLARE_DYNAMIC_CLASS(wxChoice)

 
 

- public:
-  wxChoice() {}
-  virtual ~wxChoice() ;
+public:
+    wxChoice()
+        : m_strings(), m_datas(), m_macPopUpMenuHandle(NULL)
+        {}
+    
+    virtual ~wxChoice() ;

 
   wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
 
   wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,


@@ -64,7 +67,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual void SetString( int , const wxString& s ) ;
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual void SetString( int , const wxString& s ) ;

-       void            MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+       void            MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;

 
 /*
   virtual void Append(const wxString& item);
 
 /*
   virtual void Append(const wxString& item);


@@ -78,26 +81,24 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
 
   // Mac specific
   virtual void Command(wxCommandEvent& event);
 
   // Mac specific
   virtual void Command(wxCommandEvent& event);

-  void         MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+  void         MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;

 
   virtual inline int GetColumns() const { return 1 ; };
 */
 protected:
 
   virtual inline int GetColumns() const { return 1 ; };
 */
 protected:

+    virtual wxSize DoGetBestSize() 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 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 DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-

     // free all memory we have (used by Clear() and dtor)
     // free all memory we have (used by Clear() and dtor)

-    void Free();
+    // prevent collision with some BSD definitions of macro Free()   
+    void FreeData();

 
   wxArrayString m_strings;
 
   wxArrayString m_strings;

-  wxChoiceDataArray m_dataArray ;
-  MenuHandle   m_macPopUpMenuHandle ;
+  wxChoiceDataArray m_datas ;
+  WXHMENU      m_macPopUpMenuHandle ;

 };
 
 #endif
 };
 
 #endif