added wx/defs.h include to correct compilation issues under Mac OS X

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

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 8537da556308ec0164c9f051971b807d9f20fe23..581ffdc0851b9794ca3deb577739cdf1793d6873 100644 (file)
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -37,7 +37,7 @@
 #define _WX_UNIV_COMBOBOX_H_
 
 #ifdef __GNUG__
 #define _WX_UNIV_COMBOBOX_H_
 
 #ifdef __GNUG__

-    #pragma implementation "univcombobox.h"
+    #pragma interface "univcombobox.h"

 #endif
 
 class WXDLLEXPORT wxComboControl;
 #endif
 
 class WXDLLEXPORT wxComboControl;


@@ -174,7 +174,7 @@ protected:
                                const wxString& strArg = wxEmptyString);
 
     // event handlers
                                const wxString& strArg = wxEmptyString);
 
     // event handlers

-    void OnKey(wxCommandEvent& event);
+    void OnKey(wxKeyEvent& event);

 
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();


@@ -270,6 +270,8 @@ public:
     virtual void Select(int n);
     virtual int GetSelection() const;
     void SetSelection(int n) { Select(n); }
     virtual void Select(int n);
     virtual int GetSelection() const;
     void SetSelection(int n) { Select(n); }

+    
+    void SetStringSelection(const wxString& s) {  }

 
 protected:
     virtual int DoAppend(const wxString& item);
 
 protected:
     virtual int DoAppend(const wxString& item);


@@ -301,7 +303,7 @@ class WXDLLEXPORT wxStdComboBoxInputHandler : public wxStdInputHandler
 public:
     wxStdComboBoxInputHandler(wxInputHandler *inphand);
 
 public:
     wxStdComboBoxInputHandler(wxInputHandler *inphand);
 

-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,

                            const wxKeyEvent& event,
                            bool pressed);
 };
                            const wxKeyEvent& event,
                            bool pressed);
 };