fixed virtual function hiding for LoadBitmap()

[wxWidgets.git] / include / wx / generic / scrolwin.h

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 4d0d0e33073dbcda2f08232ba1682f54708eface..8ce2e1499622d0efed89e86bf00536eb24996a8a 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -23,7 +23,7 @@
 #include "wx/window.h"
 #include "wx/panel.h"
 
 #include "wx/window.h"
 #include "wx/panel.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;

 
 // default scrolled window style
 #ifndef wxScrolledWindowStyle
 
 // default scrolled window style
 #ifndef wxScrolledWindowStyle


@@ -32,6 +32,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 // avoid triggering this stupid VC++ warning
 #ifdef __VISUALC__
 
 // avoid triggering this stupid VC++ warning
 #ifdef __VISUALC__

+    #if _MSC_VER > 1100
+        #pragma warning(push)
+    #endif

     #pragma warning(disable:4355) // 'this' used in base member initializer list
 #endif
 
     #pragma warning(disable:4355) // 'this' used in base member initializer list
 #endif
 


@@ -45,7 +48,7 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
 public:
     wxGenericScrolledWindow() : wxScrollHelper(this) { }
     wxGenericScrolledWindow(wxWindow *parent,
 public:
     wxGenericScrolledWindow() : wxScrollHelper(this) { }
     wxGenericScrolledWindow(wxWindow *parent,

-                     wxWindowID winid = -1,
+                     wxWindowID winid = wxID_ANY,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxScrolledWindowStyle,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxScrolledWindowStyle,


@@ -71,6 +74,14 @@ public:
 
     virtual void DoSetVirtualSize(int x, int y);
 
 
     virtual void DoSetVirtualSize(int x, int y);
 

+    // wxWindow's GetBestVirtualSize returns the actual window size,
+    // whereas we want to return the virtual size
+    virtual wxSize GetBestVirtualSize() const;
+
+    // Return the size best suited for the current window
+    // (this isn't a virtual size, this is a sensible size for the window)
+    virtual wxSize DoGetBestSize() const;
+

 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()
 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()


@@ -87,8 +98,8 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-#ifdef __VISUALC__
-    #pragma warning(default:4355)
+#if defined(__VISUALC__) && (_MSC_VER > 1100)
+    #pragma warning(pop)

 #endif
 
 #endif
 #endif
 
 #endif