set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/univ/scrarrow.h b/include/wx/univ/scrarrow.h
index cd0b6c2475b80fe2a2489a685d5661970450f0f4..57cc4df70a9fee16629ec48cef3f1a81a7b4dffc 100644 (file)
--- a/include/wx/univ/scrarrow.h
+++ b/include/wx/univ/scrarrow.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_SCRARROW_H_
 #define _WX_UNIV_SCRARROW_H_
 
 #ifndef _WX_UNIV_SCRARROW_H_
 #define _WX_UNIV_SCRARROW_H_
 

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

 // ----------------------------------------------------------------------------
 // wxScrollArrows is not a control but just a class containing the common
 // functionality of scroll arrows, whether part of scrollbars, spin ctrls or
 // ----------------------------------------------------------------------------
 // wxScrollArrows is not a control but just a class containing the common
 // functionality of scroll arrows, whether part of scrollbars, spin ctrls or


@@ -85,6 +81,8 @@ private:
 class WXDLLEXPORT wxControlWithArrows
 {
 public:
 class WXDLLEXPORT wxControlWithArrows
 {
 public:

+    virtual ~wxControlWithArrows() {}
+

     // get the renderer to use for drawing the arrows
     virtual wxRenderer *GetRenderer() const = 0;
 
     // get the renderer to use for drawing the arrows
     virtual wxRenderer *GetRenderer() const = 0;