use symbolic name for the shell menu bar too; include resources.h in wince.rc directl...

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

diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index 3eebbb45f4b7af12a40049ad94aaf64bbc1d4c7b..1d008aa644aedaafe7db0456b153e3052584ae7e 100644 (file)
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -97,8 +97,8 @@ class WXDLLEXPORT wxComboBox : public wxChoice
     //
     // List functions: see wxChoice
     //
     //
     // List functions: see wxChoice
     //

-    inline wxString GetValue(void) const { return GetLabel(); }
-    virtual void    SetValue(const wxString& rsValue);
+    virtual wxString GetValue(void) const;
+    virtual void     SetValue(const wxString& rsValue);

 
     //
     // Clipboard operations
 
     //
     // Clipboard operations


@@ -132,13 +132,6 @@ 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:
     DECLARE_DYNAMIC_CLASS(wxComboBox)
 }; // end of CLASS wxComboBox
 private:
     DECLARE_DYNAMIC_CLASS(wxComboBox)
 }; // end of CLASS wxComboBox