signned/unsigned fix

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

diff --git a/include/wx/mac/combobox.h b/include/wx/mac/combobox.h
index c8d91061cf685388a79a72b247d2abb3d736a552..eec2b6360a56e6d11268972ccf66a779bd3b22e8 100644 (file)
--- a/include/wx/mac/combobox.h
+++ b/include/wx/mac/combobox.h
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_


@@ -16,6 +16,7 @@
 #pragma interface "combobox.h"
 #endif
 
 #pragma interface "combobox.h"
 #endif
 

+#include "wx/textctrl.h"

 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;


@@ -28,6 +29,19 @@ class WXDLLEXPORT wxComboBox: public wxChoice
 
  public:
   inline wxComboBox() {}
 
  public:
   inline wxComboBox() {}

+    virtual ~wxComboBox();
+    // override the base class virtuals involved in geometry calculations
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+
+    // forward these functions to all subcontrols
+    virtual bool Enable(bool enable = TRUE);
+    virtual bool Show(bool show = TRUE);
+    virtual void SetFocus();
+
+    // callback functions
+    virtual void DelegateTextChanged( const wxString& value );
+    virtual void DelegateChoice( const wxString& value );

 
   inline wxComboBox(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,
 
   inline wxComboBox(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,


@@ -60,7 +74,6 @@ class WXDLLEXPORT wxComboBox: public wxChoice
   virtual wxString GetString(int n) const ;
   virtual wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);
   virtual wxString GetString(int n) const ;
   virtual wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);

-  virtual inline int Number() const { return m_noStrings; }

   
   // Text field functions
   virtual wxString GetValue() const ;
   
   // Text field functions
   virtual wxString GetValue() const ;


@@ -78,10 +91,11 @@ class WXDLLEXPORT wxComboBox: public wxChoice
   virtual void Remove(long from, long to);
   virtual void SetSelection(long from, long to);
   virtual void SetEditable(bool editable);
   virtual void Remove(long from, long to);
   virtual void SetSelection(long from, long to);
   virtual void SetEditable(bool editable);

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

 protected:
 protected:

-  int m_noStrings;
-  WXHMENU      m_macPopUpMenuHandle ;
+    // the subcontrols
+    wxTextCtrl*     m_text;
+    wxChoice*       m_choice;

 };
 
 #endif
 };
 
 #endif