Use "_x64" instead of "amd64" for x64 MSW makefile builds.

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

diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index e1373b9bdc62877475bd5ffea993d73438a43adb..233d0f0d027505119c39a59500699acfa9d4941b 100644 (file)
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.h
+// Name:        wx/os2/combobox.h

 // Purpose:     wxComboBox class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxComboBox class
 // Author:      David Webster
 // Modified by:


@@ -13,11 +13,13 @@
 #define _WX_COMBOBOX_H_
 
 #include "wx/choice.h"
 #define _WX_COMBOBOX_H_
 
 #include "wx/choice.h"

+#include "wx/textentry.h"

 
 #if wxUSE_COMBOBOX
 
 // Combobox item
 
 #if wxUSE_COMBOBOX
 
 // Combobox item

-class WXDLLEXPORT wxComboBox : public wxChoice
+class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
+                               public wxTextEntry

 {
 
  public:
 {
 
  public:


@@ -94,35 +96,26 @@ class WXDLLEXPORT wxComboBox : public wxChoice
                 ,const wxString&      rsName = wxComboBoxNameStr
                );
 
                 ,const wxString&      rsName = wxComboBoxNameStr
                );
 

-    //
-    // List functions: see wxChoice
-    //
-    inline wxString GetValue(void) const { return GetLabel(); }
-    virtual void    SetValue(const wxString& rsValue);
-
-    //
-    // Clipboard operations
-    //
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-
-    virtual void        SetInsertionPoint(long lPos);
-    virtual void        SetInsertionPointEnd(void);
-    virtual long        GetInsertionPoint(void) const;
-    virtual long        GetLastPosition(void) const;
-    virtual void        Replace( long            lFrom
-                                ,long            lTo
-                                ,const wxString& rsValue
-                               );
-    virtual void        Remove( long lFrom
-                               ,long lTo
-                              );
+    // See wxComboBoxBase discussion of IsEmpty().
+    bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+    bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
+
+    // resolve ambiguities among virtual functions inherited from both base
+    // classes
+    virtual void Clear();
+    virtual wxString GetValue() const;
+    virtual void SetValue(const wxString& value);
+    virtual wxString GetStringSelection() const
+        { return wxChoice::GetStringSelection(); }
+

     inline virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
     inline virtual void SetSelection(int n) { wxChoice::SetSelection(n); }

-    virtual void        SetSelection( long lFrom
-                                     ,long lTo
-                                    );
-    virtual void        SetEditable(bool bEditable);
+    virtual void SetSelection(long from, long to)
+        { wxTextEntry::SetSelection(from, to); }
+    virtual int GetSelection() const { return wxChoice::GetSelection(); }
+    virtual void GetSelection(long *from, long *to) const
+        { wxTextEntry::GetSelection(from, to); }
+
+    virtual bool IsEditable() const;

 
     virtual bool        OS2Command( WXUINT uParam
                                    ,WXWORD wId
 
     virtual bool        OS2Command( WXUINT uParam
                                    ,WXWORD wId


@@ -132,14 +125,11 @@ class WXDLLEXPORT wxComboBox : public wxChoice
                                        ,WXLPARAM lParam
                                       );
 
                                        ,WXLPARAM lParam
                                       );
 

-protected:
-    virtual void        DoSetSize( int nX
-                                  ,int nY
-                                  ,int nWidth
-                                  ,int nHeight
-                                  ,int nSizeFlags = wxSIZE_AUTO
-                                 );

 private:
 private:

+    // implement wxTextEntry pure virtual methods
+    virtual wxWindow *GetEditableWindow() { return this; }
+    virtual WXHWND GetEditHWND() const { return m_hWnd; }
+

     DECLARE_DYNAMIC_CLASS(wxComboBox)
 }; // end of CLASS wxComboBox
 
     DECLARE_DYNAMIC_CLASS(wxComboBox)
 }; // end of CLASS wxComboBox