Better markup.

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 64737702c677b3dffe5c9d8af8ab29cd9347b30d..fc55e3177b63e5b1f3b5e31ceb101449b6300a49 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_SCROLLWIN_H_
 #define _WX_GENERIC_SCROLLWIN_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_SCROLLWIN_H_
 #define _WX_GENERIC_SCROLLWIN_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "genscrolwin.h"
 #endif
 
     #pragma interface "genscrolwin.h"
 #endif
 


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

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

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxScrolledWindowStyle,
                      const wxString& name = wxPanelNameStr)
         : wxScrollHelper(this)
     {
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxScrolledWindowStyle,
                      const wxString& name = wxPanelNameStr)
         : wxScrollHelper(this)
     {

-        Create(parent, id, pos, size, style, name);
+        Create(parent, winid, pos, size, style, name);

     }
 
     virtual ~wxGenericScrolledWindow();
 
     bool Create(wxWindow *parent,
     }
 
     virtual ~wxGenericScrolledWindow();
 
     bool Create(wxWindow *parent,

-                wxWindowID id,
+                wxWindowID winid,

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


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

-#if WXWIN_COMPATIBILITY   
-     virtual void GetScrollUnitsPerPage(int *x_page, int *y_page) const;   
-     virtual void CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const;
-     // Need to do this otherwise the compiler gets confuced 
-     // between float and int calls to this function.
-     void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
-        { wxScrollHelper::CalcScrolledPosition(x, y, xx, yy); }
-     wxPoint CalcUnscrolledPosition(const wxPoint& pt) const
-        { return wxScrollHelper::CalcScrolledPosition(pt); }
-#endif // WXWIN_COMPATIBILITY
-

 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()


@@ -90,11 +79,11 @@ protected:
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
 #ifdef __WXMSW__
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
 #ifdef __WXMSW__

-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 #endif // __WXMSW__
 
 private:
 #endif // __WXMSW__
 
 private:

-    DECLARE_ABSTRACT_CLASS(wxGenericScrolledWindow)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericScrolledWindow)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };