Applied patch [ 1445031 ] wxString passed as ellipsis argument in richtexthtml.cpp

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 4a841ec05b54efa03e0733ae0f66b20ade6c71fb..6259ab78fc71709140c9efcde2ed73af550bc750 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -12,10 +12,6 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "combobox.h"
-#endif
-

 #include "wx/choice.h"
 
 #if wxUSE_COMBOBOX
 #include "wx/choice.h"
 
 #if wxUSE_COMBOBOX


@@ -95,12 +91,12 @@ public:
     virtual wxTextPos GetLastPosition() const;
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
     virtual wxTextPos GetLastPosition() const;
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);

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

     virtual void SetSelection(long from, long to);
     virtual int GetSelection() const;
     virtual void GetSelection(long* from, long* to) const;
     virtual void SetEditable(bool editable);
     virtual void SetSelection(long from, long to);
     virtual int GetSelection() const;
     virtual void GetSelection(long* from, long* to) const;
     virtual void SetEditable(bool editable);

-    virtual void Clear() { wxChoice::Clear(); m_selectionOld = -1; }
+    virtual void Clear();

 
     virtual void Undo() ;
     virtual void Redo() ;
 
     virtual void Undo() ;
     virtual void Redo() ;


@@ -134,9 +130,9 @@ public:
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 

-protected:

     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 

+protected:

     // common part of all ctors
     void Init() { m_selectionOld = -1; }
 
     // common part of all ctors
     void Init() { m_selectionOld = -1; }