This commit was manufactured by cvs2svn to create tag

'WORKING_KBD_NAVIGATION'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WORKING_KBD_NAVIGATION@1605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/scrolwin.h

@@ -1,90 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/scrolwin.h
-// Purpose:     wxGenericScrolledWindow class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GENERIC_SCROLLWIN_H_
-#define _WX_GENERIC_SCROLLWIN_H_
-
-// ----------------------------------------------------------------------------
-// headers and constants
-// ----------------------------------------------------------------------------
-
-#include "wx/window.h"
-#include "wx/panel.h"
-
-extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
-
-// default scrolled window style
-#ifndef wxScrolledWindowStyle
-    #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
-#endif
-
-// ----------------------------------------------------------------------------
-// wxGenericScrolledWindow
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
-                                            public wxScrollHelper
-{
-public:
-    wxGenericScrolledWindow() : wxScrollHelper(this) { }
-    wxGenericScrolledWindow(wxWindow *parent,
-                     wxWindowID winid = wxID_ANY,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = wxScrolledWindowStyle,
-                     const wxString& name = wxPanelNameStr)
-        : wxScrollHelper(this)
-    {
-        Create(parent, winid, pos, size, style, name);
-    }
-
-    virtual ~wxGenericScrolledWindow();
-
-    bool Create(wxWindow *parent,
-                wxWindowID winid,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxScrolledWindowStyle,
-                const wxString& name = wxPanelNameStr);
-
-    virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
-
-    // lay out the window and its children
-    virtual bool Layout();
-
-    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()
-    void OnPaint(wxPaintEvent& event);
-
-    // we need to return a special WM_GETDLGCODE value to process just the
-    // arrows but let the other navigation characters through
-#ifdef __WXMSW__
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-#endif // __WXMSW__
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericScrolledWindow)
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // _WX_GENERIC_SCROLLWIN_H_
-

include/wx/gtk/scrolwin.h

@@ -1,193 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/scrolwin.h
-// Purpose:     wxScrolledWindow class
-// Author:      Robert Roebling
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GTK_SCROLLWIN_H_
-#define _WX_GTK_SCROLLWIN_H_
-
-// ----------------------------------------------------------------------------
-// headers and constants
-// ----------------------------------------------------------------------------
-
-#include "wx/window.h"
-#include "wx/panel.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
-
-// default scrolled window style
-#ifndef wxScrolledWindowStyle
-#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
-#endif
-
-// ----------------------------------------------------------------------------
-// wxScrolledWindow
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxScrolledWindow : public wxPanel
-{
-public:
-    wxScrolledWindow()
-        { Init(); }
-
-    wxScrolledWindow(wxWindow *parent,
-                     wxWindowID id = -1,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = wxScrolledWindowStyle,
-                     const wxString& name = wxPanelNameStr)
-        { Create(parent, id, pos, size, style, name); }
-
-    void Init();
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxScrolledWindowStyle,
-                const wxString& name = wxPanelNameStr);
-
-    // Normally the wxScrolledWindow will scroll itself, but in
-    // some rare occasions you might want it to scroll another
-    // window (e.g. a child of it in order to scroll only a portion
-    // the area between the scrollbars (spreadsheet: only cell area
-    // will move).
-    virtual void SetTargetWindow( wxWindow *target, bool pushEventHandler = FALSE );
-    virtual wxWindow *GetTargetWindow() const;
-
-    // Set the scrolled area of the window.
-    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;
-
-    // Set the x, y scrolling increments.
-    void SetScrollRate( int xstep, int ystep );
-
-    // Number of pixels per user unit (0 or -1 for no scrollbar)
-    // Length of virtual canvas in user units
-    // Length of page in user units
-    // Default action is to set the virtual size and alter scrollbars
-    // accordingly.
-    virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
-                             int noUnitsX, int noUnitsY,
-                             int xPos = 0, int yPos = 0,
-                             bool noRefresh = FALSE );
-
-    // Physically scroll the window
-    virtual void Scroll(int x_pos, int y_pos);
-
-    int GetScrollPageSize(int orient) const;
-    void SetScrollPageSize(int orient, int pageSize);
-
-    virtual void GetScrollPixelsPerUnit(int *x_unit, int *y_unit) const;
-
-    // Enable/disable Windows scrolling in either direction.
-    // If TRUE, wxWidgets scrolls the canvas and only a bit of
-    // the canvas is invalidated; no Clear() is necessary.
-    // If FALSE, the whole canvas is invalidated and a Clear() is
-    // necessary. Disable for when the scroll increment is used
-    // to actually scroll a non-constant distance
-    virtual void EnableScrolling(bool x_scrolling, bool y_scrolling);
-
-    // Get the view start
-    virtual void GetViewStart(int *x, int *y) const;
-
-    // translate between scrolled and unscrolled coordinates
-    void CalcScrolledPosition(int x, int y, int *xx, int *yy) const
-        {  DoCalcScrolledPosition(x, y, xx, yy); }
-    wxPoint CalcScrolledPosition(const wxPoint& pt) const
-    {
-        wxPoint p2;
-        DoCalcScrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
-        return p2;
-    }
-
-    void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
-        {  DoCalcUnscrolledPosition(x, y, xx, yy); }
-    wxPoint CalcUnscrolledPosition(const wxPoint& pt) const
-    {
-        wxPoint p2;
-        DoCalcUnscrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
-        return p2;
-    }
-
-    virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
-    virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
-
-    // Override this function to draw the graphic (or just process EVT_PAINT)
-    virtual void OnDraw(wxDC& WXUNUSED(dc)) {}
-
-    // Override this function if you don't want to have wxScrolledWindow
-    // automatically change the origin according to the scroll position.
-    void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
-
-    // lay out the window and its children
-    virtual bool Layout();
-
-    // Adjust the scrollbars
-    virtual void AdjustScrollbars();
-
-    // Set the scale factor, used in PrepareDC
-    void SetScale(double xs, double ys) { m_scaleX = xs; m_scaleY = ys; }
-    double GetScaleX() const { return m_scaleX; }
-    double GetScaleY() const { return m_scaleY; }
-
-    // implementation from now on
-    void OnScroll(wxScrollWinEvent& event);
-    void OnSize(wxSizeEvent& event);
-    void OnPaint(wxPaintEvent& event);
-    void OnChar(wxKeyEvent& event);
-
-    void GtkVScroll( float value, unsigned int scroll_type );
-    void GtkHScroll( float value, unsigned int scroll_type );
-    void GtkVConnectEvent();
-    void GtkHConnectEvent();
-    void GtkVDisconnectEvent();
-    void GtkHDisconnectEvent();
-
-    // Calculate scroll increment
-    virtual int CalcScrollInc(wxScrollWinEvent& event);
-
-    // Overridden from wxWidgets due callback being static
-    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
-
-    virtual void DoPrepareDC(wxDC& dc);
-
-protected:
-    wxWindow             *m_targetWindow;
-    int                   m_xScrollPixelsPerLine;
-    int                   m_yScrollPixelsPerLine;
-    bool                  m_xScrollingEnabled;
-    bool                  m_yScrollingEnabled;
-
-    // FIXME: these next four members are duplicated in the GtkAdjustment
-    //        members of wxWindow.  Can they be safely removed from here?
-
-    int                   m_xScrollPosition;
-    int                   m_yScrollPosition;
-    int                   m_xScrollLinesPerPage;
-    int                   m_yScrollLinesPerPage;
-
-    double                m_scaleY,m_scaleX;
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxScrolledWindow)
-};
-
-#endif
-    // _WX_GTK_SCROLLWIN_H_
-
-// vi:sts=4:sw=4:et

include/wx/gtk/window.h

@@ -1,300 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/window.h
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __GTKWINDOWH__
-#define __GTKWINDOWH__
-
-// helper structure that holds class that holds GtkIMContext object and
-// some additional data needed for key events processing
-struct wxGtkIMData;
-
-//-----------------------------------------------------------------------------
-// callback definition for inserting a window (internal)
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowGTK;
-typedef void (*wxInsertChildFunction)( wxWindowGTK*, wxWindowGTK* );
-
-//-----------------------------------------------------------------------------
-// wxWindowGTK
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowGTK : public wxWindowBase
-{
-public:
-    // creating the window
-    // -------------------
-    wxWindowGTK();
-    wxWindowGTK(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-    virtual ~wxWindowGTK();
-
-    // implement base class (pure) virtual methods
-    // -------------------------------------------
-
-    virtual bool Destroy();
-
-    virtual void Raise();
-    virtual void Lower();
-
-    virtual bool Show( bool show = TRUE );
-    virtual bool Enable( bool enable = TRUE );
-
-    virtual bool IsRetained() const;
-
-    virtual void SetFocus();
-    virtual bool AcceptsFocus() const;
-
-    virtual bool Reparent( wxWindowBase *newParent );
-
-    virtual void WarpPointer(int x, int y);
-
-    virtual void Refresh( bool eraseBackground = TRUE,
-                          const wxRect *rect = (const wxRect *) NULL );
-    virtual void Update();
-    virtual void ClearBackground();
-
-    virtual bool SetBackgroundColour( const wxColour &colour );
-    virtual bool SetForegroundColour( const wxColour &colour );
-    virtual bool SetCursor( const wxCursor &cursor );
-    virtual bool SetFont( const wxFont &font );
-
-    virtual bool SetBackgroundStyle(wxBackgroundStyle style) ;
-
-    virtual int GetCharHeight() const;
-    virtual int GetCharWidth() const;
-    virtual void GetTextExtent(const wxString& string,
-                               int *x, int *y,
-                               int *descent = (int *) NULL,
-                               int *externalLeading = (int *) NULL,
-                               const wxFont *theFont = (const wxFont *) NULL)
-                               const;
-
-#if wxUSE_MENUS_NATIVE
-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
-#endif // wxUSE_MENUS_NATIVE
-
-    virtual void SetScrollbar( int orient, int pos, int thumbVisible,
-                               int range, bool refresh = TRUE );
-    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
-    virtual int GetScrollPos( int orient ) const;
-    virtual int GetScrollThumb( int orient ) const;
-    virtual int GetScrollRange( int orient ) const;
-    virtual void ScrollWindow( int dx, int dy,
-                               const wxRect* rect = (wxRect *) NULL );
-
-#if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget( wxDropTarget *dropTarget );
-#endif // wxUSE_DRAG_AND_DROP
-
-#ifdef __WXGTK20__
-    virtual void AddChild( wxWindowBase *child );
-    virtual void RemoveChild( wxWindowBase *child );
-#endif
-
-    // implementation
-    // --------------
-
-    virtual WXWidget GetHandle() const { return m_widget; }
-
-    // I don't want users to override what's done in idle so everything that
-    // has to be done in idle time in order for wxGTK to work is done in
-    // OnInternalIdle
-    virtual void OnInternalIdle();
-
-    // Internal represention of Update()
-    void GtkUpdate();
-
-    // For compatibility across platforms (not in event table)
-    void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
-
-    // wxGTK-specific: called recursively by Enable,
-    // to give widgets an oppprtunity to correct their colours after they
-    // have been changed by Enable
-    virtual void OnParentEnable( bool WXUNUSED(enable) ) {}
-
-    // Used by all window classes in the widget creation process.
-    bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size );
-    void PostCreation();
-
-    // Internal addition of child windows. differs from class
-    // to class not by using virtual functions but by using
-    // the m_insertCallback.
-    void DoAddChild(wxWindowGTK *child);
-
-    // This methods sends wxPaintEvents to the window. It reads the
-    // update region, breaks it up into rects and sends an event
-    // for each rect. It is also responsible for background erase
-    // events and NC paint events. It is called from "draw" and
-    // "expose" handlers as well as from ::Update()
-    void GtkSendPaintEvents();
-
-    // The methods below are required because many native widgets
-    // are composed of several subwidgets and setting a style for
-    // the widget means setting it for all subwidgets as well.
-    // also, it is nor clear, which native widget is the top
-    // widget where (most of) the input goes. even tooltips have
-    // to be applied to all subwidgets.
-    virtual GtkWidget* GetConnectWidget();
-    virtual bool IsOwnGtkWindow( GdkWindow *window );
-    void ConnectWidget( GtkWidget *widget );
-
-#ifdef __WXGTK20__
-    // Returns the default context which usually is anti-aliased
-    PangoContext   *GtkGetPangoDefaultContext();
-
-    // Returns the X11 context which renders on the X11 client
-    // side (which can be remote) and which usually is not
-    // anti-aliased and is thus faster
-    // MR: Now returns the default pango_context for the widget as GtkGetPangoDefaultContext to
-    // not depend on libpangox - which is completely deprecated.
-    //BCI: Remove GtkGetPangoX11Context and m_x11Context completely when symbols may be removed
-    PangoContext   *GtkGetPangoX11Context();
-    PangoContext   *m_x11Context; // MR: Now unused
-#endif
-
-#if wxUSE_TOOLTIPS
-    virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
-#endif // wxUSE_TOOLTIPS
-
-    // Called from GTK signales handlers. it indicates that
-    // the layouting functions have to be called later on
-    // (i.e. in idle time, implemented in OnInternalIdle() ).
-    void GtkUpdateSize() { m_sizeSet = FALSE; }
-
-    // fix up the mouse event coords, used by wxListBox only so far
-    virtual void FixUpMouseEvent(GtkWidget * WXUNUSED(widget),
-                                 wxCoord& WXUNUSED(x),
-                                 wxCoord& WXUNUSED(y)) { }
-
-    // is this window transparent for the mouse events (as wxStaticBox is)?
-    virtual bool IsTransparentForMouse() const { return FALSE; }
-
-    // is this a radiobutton (used by radiobutton code itself only)?
-    virtual bool IsRadioButton() const { return FALSE; }
-
-    // position and size of the window
-    int                  m_x, m_y;
-    int                  m_width, m_height;
-    int                  m_oldClientWidth,m_oldClientHeight;
-
-    // see the docs in src/gtk/window.cpp
-    GtkWidget           *m_widget;          // mostly the widget seen by the rest of GTK
-    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWidgets
-
-    // this widget will be queried for GTK's focus events
-    GtkWidget           *m_focusWidget;
-
-#ifdef __WXGTK20__
-    wxGtkIMData         *m_imData;
-#else // GTK 1
-#ifdef HAVE_XIM
-    // XIM support for wxWidgets
-    GdkIC               *m_ic;
-    GdkICAttr           *m_icattr;
-#endif // HAVE_XIM
-#endif // GTK 2/1
-
-#ifndef __WXGTK20__
-    // The area to be cleared (and not just refreshed)
-    // We cannot make this distinction under GTK 2.0.
-    wxRegion             m_clearRegion;
-#endif
-
-    // scrolling stuff
-    GtkAdjustment       *m_hAdjust,*m_vAdjust;
-    float                m_oldHorizontalPos;
-    float                m_oldVerticalPos;
-
-    // extra (wxGTK-specific) flags
-    bool                 m_needParent:1;        // ! wxFrame, wxDialog, wxNotebookPage ?
-    bool                 m_noExpose:1;          // wxGLCanvas has its own redrawing
-    bool                 m_nativeSizeEvent:1;   // wxGLCanvas sends wxSizeEvent upon "alloc_size"
-    bool                 m_hasScrolling:1;
-    bool                 m_hasVMT:1;
-    bool                 m_sizeSet:1;
-    bool                 m_resizing:1;
-    bool                 m_acceptsFocus:1;      // true if not static
-    bool                 m_hasFocus:1;          // true if == FindFocus()
-    bool                 m_isScrolling:1;       // dragging scrollbar thumb?
-    bool                 m_clipPaintRegion:1;   // TRUE after ScrollWindow()
-#ifdef __WXGTK20__
-    bool                 m_dirtyTabOrder:1;     // tab order changed, GTK focus
-                                                // chain needs update
-#endif
-    bool                 m_needsStyleChange:1;  // May not be able to change
-                                                // background style until OnIdle
-
-    // C++ has no virtual methods in the constrcutor of any class but we need
-    // different methods of inserting a child window into a wxFrame,
-    // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
-    wxInsertChildFunction  m_insertCallback;
-
-    // implement the base class pure virtuals
-    virtual void DoClientToScreen( int *x, int *y ) const;
-    virtual void DoScreenToClient( int *x, int *y ) const;
-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoGetClientSize( int *width, int *height ) const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
-    virtual void DoCaptureMouse();
-    virtual void DoReleaseMouse();
-
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip( wxToolTip *tip );
-#endif // wxUSE_TOOLTIPS
-
-protected:
-    // common part of all ctors (not virtual because called from ctor)
-    void Init();
-
-#ifdef __WXGTK20__
-    virtual void DoMoveInTabOrder(wxWindow *win, MoveKind move);
-
-    // Copies m_children tab order to GTK focus chain:
-    void RealizeTabOrder();
-#endif
-
-    // Called by ApplyWidgetStyle (which is called by SetFont() and
-    // SetXXXColour etc to apply style changed to native widgets) to create
-    // modified GTK style with non-standard attributes. If forceStyle=true,
-    // creates empty GtkRcStyle if there are no modifications, otherwise
-    // returns NULL in such case.
-    GtkRcStyle *CreateWidgetStyle(bool forceStyle = false);
-
-    // Overridden in many GTK widgets who have to handle subwidgets
-    virtual void ApplyWidgetStyle(bool forceStyle = false);
-
-    // helper function to ease native widgets wrapping, called by 
-    // ApplyWidgetStyle -- override this, not ApplyWidgetStyle
-    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxWindowGTK)
-    DECLARE_NO_COPY_CLASS(wxWindowGTK)
-};
-
-extern WXDLLIMPEXP_CORE wxWindow *wxFindFocusedChild(wxWindowGTK *win);
-
-#endif // __GTKWINDOWH__

include/wx/gtk1/scrolwin.h

@@ -1,193 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/scrolwin.h
-// Purpose:     wxScrolledWindow class
-// Author:      Robert Roebling
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GTK_SCROLLWIN_H_
-#define _WX_GTK_SCROLLWIN_H_
-
-// ----------------------------------------------------------------------------
-// headers and constants
-// ----------------------------------------------------------------------------
-
-#include "wx/window.h"
-#include "wx/panel.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
-
-// default scrolled window style
-#ifndef wxScrolledWindowStyle
-#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
-#endif
-
-// ----------------------------------------------------------------------------
-// wxScrolledWindow
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxScrolledWindow : public wxPanel
-{
-public:
-    wxScrolledWindow()
-        { Init(); }
-
-    wxScrolledWindow(wxWindow *parent,
-                     wxWindowID id = -1,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = wxScrolledWindowStyle,
-                     const wxString& name = wxPanelNameStr)
-        { Create(parent, id, pos, size, style, name); }
-
-    void Init();
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxScrolledWindowStyle,
-                const wxString& name = wxPanelNameStr);
-
-    // Normally the wxScrolledWindow will scroll itself, but in
-    // some rare occasions you might want it to scroll another
-    // window (e.g. a child of it in order to scroll only a portion
-    // the area between the scrollbars (spreadsheet: only cell area
-    // will move).
-    virtual void SetTargetWindow( wxWindow *target, bool pushEventHandler = FALSE );
-    virtual wxWindow *GetTargetWindow() const;
-
-    // Set the scrolled area of the window.
-    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;
-
-    // Set the x, y scrolling increments.
-    void SetScrollRate( int xstep, int ystep );
-
-    // Number of pixels per user unit (0 or -1 for no scrollbar)
-    // Length of virtual canvas in user units
-    // Length of page in user units
-    // Default action is to set the virtual size and alter scrollbars
-    // accordingly.
-    virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
-                             int noUnitsX, int noUnitsY,
-                             int xPos = 0, int yPos = 0,
-                             bool noRefresh = FALSE );
-
-    // Physically scroll the window
-    virtual void Scroll(int x_pos, int y_pos);
-
-    int GetScrollPageSize(int orient) const;
-    void SetScrollPageSize(int orient, int pageSize);
-
-    virtual void GetScrollPixelsPerUnit(int *x_unit, int *y_unit) const;
-
-    // Enable/disable Windows scrolling in either direction.
-    // If TRUE, wxWidgets scrolls the canvas and only a bit of
-    // the canvas is invalidated; no Clear() is necessary.
-    // If FALSE, the whole canvas is invalidated and a Clear() is
-    // necessary. Disable for when the scroll increment is used
-    // to actually scroll a non-constant distance
-    virtual void EnableScrolling(bool x_scrolling, bool y_scrolling);
-
-    // Get the view start
-    virtual void GetViewStart(int *x, int *y) const;
-
-    // translate between scrolled and unscrolled coordinates
-    void CalcScrolledPosition(int x, int y, int *xx, int *yy) const
-        {  DoCalcScrolledPosition(x, y, xx, yy); }
-    wxPoint CalcScrolledPosition(const wxPoint& pt) const
-    {
-        wxPoint p2;
-        DoCalcScrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
-        return p2;
-    }
-
-    void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
-        {  DoCalcUnscrolledPosition(x, y, xx, yy); }
-    wxPoint CalcUnscrolledPosition(const wxPoint& pt) const
-    {
-        wxPoint p2;
-        DoCalcUnscrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
-        return p2;
-    }
-
-    virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
-    virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
-
-    // Override this function to draw the graphic (or just process EVT_PAINT)
-    virtual void OnDraw(wxDC& WXUNUSED(dc)) {}
-
-    // Override this function if you don't want to have wxScrolledWindow
-    // automatically change the origin according to the scroll position.
-    void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
-
-    // lay out the window and its children
-    virtual bool Layout();
-
-    // Adjust the scrollbars
-    virtual void AdjustScrollbars();
-
-    // Set the scale factor, used in PrepareDC
-    void SetScale(double xs, double ys) { m_scaleX = xs; m_scaleY = ys; }
-    double GetScaleX() const { return m_scaleX; }
-    double GetScaleY() const { return m_scaleY; }
-
-    // implementation from now on
-    void OnScroll(wxScrollWinEvent& event);
-    void OnSize(wxSizeEvent& event);
-    void OnPaint(wxPaintEvent& event);
-    void OnChar(wxKeyEvent& event);
-
-    void GtkVScroll( float value, unsigned int scroll_type );
-    void GtkHScroll( float value, unsigned int scroll_type );
-    void GtkVConnectEvent();
-    void GtkHConnectEvent();
-    void GtkVDisconnectEvent();
-    void GtkHDisconnectEvent();
-
-    // Calculate scroll increment
-    virtual int CalcScrollInc(wxScrollWinEvent& event);
-
-    // Overridden from wxWidgets due callback being static
-    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
-
-    virtual void DoPrepareDC(wxDC& dc);
-
-protected:
-    wxWindow             *m_targetWindow;
-    int                   m_xScrollPixelsPerLine;
-    int                   m_yScrollPixelsPerLine;
-    bool                  m_xScrollingEnabled;
-    bool                  m_yScrollingEnabled;
-
-    // FIXME: these next four members are duplicated in the GtkAdjustment
-    //        members of wxWindow.  Can they be safely removed from here?
-
-    int                   m_xScrollPosition;
-    int                   m_yScrollPosition;
-    int                   m_xScrollLinesPerPage;
-    int                   m_yScrollLinesPerPage;
-
-    double                m_scaleY,m_scaleX;
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxScrolledWindow)
-};
-
-#endif
-    // _WX_GTK_SCROLLWIN_H_
-
-// vi:sts=4:sw=4:et

include/wx/gtk1/window.h

@@ -1,300 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/window.h
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __GTKWINDOWH__
-#define __GTKWINDOWH__
-
-// helper structure that holds class that holds GtkIMContext object and
-// some additional data needed for key events processing
-struct wxGtkIMData;
-
-//-----------------------------------------------------------------------------
-// callback definition for inserting a window (internal)
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowGTK;
-typedef void (*wxInsertChildFunction)( wxWindowGTK*, wxWindowGTK* );
-
-//-----------------------------------------------------------------------------
-// wxWindowGTK
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowGTK : public wxWindowBase
-{
-public:
-    // creating the window
-    // -------------------
-    wxWindowGTK();
-    wxWindowGTK(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-    virtual ~wxWindowGTK();
-
-    // implement base class (pure) virtual methods
-    // -------------------------------------------
-
-    virtual bool Destroy();
-
-    virtual void Raise();
-    virtual void Lower();
-
-    virtual bool Show( bool show = TRUE );
-    virtual bool Enable( bool enable = TRUE );
-
-    virtual bool IsRetained() const;
-
-    virtual void SetFocus();
-    virtual bool AcceptsFocus() const;
-
-    virtual bool Reparent( wxWindowBase *newParent );
-
-    virtual void WarpPointer(int x, int y);
-
-    virtual void Refresh( bool eraseBackground = TRUE,
-                          const wxRect *rect = (const wxRect *) NULL );
-    virtual void Update();
-    virtual void ClearBackground();
-
-    virtual bool SetBackgroundColour( const wxColour &colour );
-    virtual bool SetForegroundColour( const wxColour &colour );
-    virtual bool SetCursor( const wxCursor &cursor );
-    virtual bool SetFont( const wxFont &font );
-
-    virtual bool SetBackgroundStyle(wxBackgroundStyle style) ;
-
-    virtual int GetCharHeight() const;
-    virtual int GetCharWidth() const;
-    virtual void GetTextExtent(const wxString& string,
-                               int *x, int *y,
-                               int *descent = (int *) NULL,
-                               int *externalLeading = (int *) NULL,
-                               const wxFont *theFont = (const wxFont *) NULL)
-                               const;
-
-#if wxUSE_MENUS_NATIVE
-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
-#endif // wxUSE_MENUS_NATIVE
-
-    virtual void SetScrollbar( int orient, int pos, int thumbVisible,
-                               int range, bool refresh = TRUE );
-    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
-    virtual int GetScrollPos( int orient ) const;
-    virtual int GetScrollThumb( int orient ) const;
-    virtual int GetScrollRange( int orient ) const;
-    virtual void ScrollWindow( int dx, int dy,
-                               const wxRect* rect = (wxRect *) NULL );
-
-#if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget( wxDropTarget *dropTarget );
-#endif // wxUSE_DRAG_AND_DROP
-
-#ifdef __WXGTK20__
-    virtual void AddChild( wxWindowBase *child );
-    virtual void RemoveChild( wxWindowBase *child );
-#endif
-
-    // implementation
-    // --------------
-
-    virtual WXWidget GetHandle() const { return m_widget; }
-
-    // I don't want users to override what's done in idle so everything that
-    // has to be done in idle time in order for wxGTK to work is done in
-    // OnInternalIdle
-    virtual void OnInternalIdle();
-
-    // Internal represention of Update()
-    void GtkUpdate();
-
-    // For compatibility across platforms (not in event table)
-    void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
-
-    // wxGTK-specific: called recursively by Enable,
-    // to give widgets an oppprtunity to correct their colours after they
-    // have been changed by Enable
-    virtual void OnParentEnable( bool WXUNUSED(enable) ) {}
-
-    // Used by all window classes in the widget creation process.
-    bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size );
-    void PostCreation();
-
-    // Internal addition of child windows. differs from class
-    // to class not by using virtual functions but by using
-    // the m_insertCallback.
-    void DoAddChild(wxWindowGTK *child);
-
-    // This methods sends wxPaintEvents to the window. It reads the
-    // update region, breaks it up into rects and sends an event
-    // for each rect. It is also responsible for background erase
-    // events and NC paint events. It is called from "draw" and
-    // "expose" handlers as well as from ::Update()
-    void GtkSendPaintEvents();
-
-    // The methods below are required because many native widgets
-    // are composed of several subwidgets and setting a style for
-    // the widget means setting it for all subwidgets as well.
-    // also, it is nor clear, which native widget is the top
-    // widget where (most of) the input goes. even tooltips have
-    // to be applied to all subwidgets.
-    virtual GtkWidget* GetConnectWidget();
-    virtual bool IsOwnGtkWindow( GdkWindow *window );
-    void ConnectWidget( GtkWidget *widget );
-
-#ifdef __WXGTK20__
-    // Returns the default context which usually is anti-aliased
-    PangoContext   *GtkGetPangoDefaultContext();
-
-    // Returns the X11 context which renders on the X11 client
-    // side (which can be remote) and which usually is not
-    // anti-aliased and is thus faster
-    // MR: Now returns the default pango_context for the widget as GtkGetPangoDefaultContext to
-    // not depend on libpangox - which is completely deprecated.
-    //BCI: Remove GtkGetPangoX11Context and m_x11Context completely when symbols may be removed
-    PangoContext   *GtkGetPangoX11Context();
-    PangoContext   *m_x11Context; // MR: Now unused
-#endif
-
-#if wxUSE_TOOLTIPS
-    virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
-#endif // wxUSE_TOOLTIPS
-
-    // Called from GTK signales handlers. it indicates that
-    // the layouting functions have to be called later on
-    // (i.e. in idle time, implemented in OnInternalIdle() ).
-    void GtkUpdateSize() { m_sizeSet = FALSE; }
-
-    // fix up the mouse event coords, used by wxListBox only so far
-    virtual void FixUpMouseEvent(GtkWidget * WXUNUSED(widget),
-                                 wxCoord& WXUNUSED(x),
-                                 wxCoord& WXUNUSED(y)) { }
-
-    // is this window transparent for the mouse events (as wxStaticBox is)?
-    virtual bool IsTransparentForMouse() const { return FALSE; }
-
-    // is this a radiobutton (used by radiobutton code itself only)?
-    virtual bool IsRadioButton() const { return FALSE; }
-
-    // position and size of the window
-    int                  m_x, m_y;
-    int                  m_width, m_height;
-    int                  m_oldClientWidth,m_oldClientHeight;
-
-    // see the docs in src/gtk/window.cpp
-    GtkWidget           *m_widget;          // mostly the widget seen by the rest of GTK
-    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWidgets
-
-    // this widget will be queried for GTK's focus events
-    GtkWidget           *m_focusWidget;
-
-#ifdef __WXGTK20__
-    wxGtkIMData         *m_imData;
-#else // GTK 1
-#ifdef HAVE_XIM
-    // XIM support for wxWidgets
-    GdkIC               *m_ic;
-    GdkICAttr           *m_icattr;
-#endif // HAVE_XIM
-#endif // GTK 2/1
-
-#ifndef __WXGTK20__
-    // The area to be cleared (and not just refreshed)
-    // We cannot make this distinction under GTK 2.0.
-    wxRegion             m_clearRegion;
-#endif
-
-    // scrolling stuff
-    GtkAdjustment       *m_hAdjust,*m_vAdjust;
-    float                m_oldHorizontalPos;
-    float                m_oldVerticalPos;
-
-    // extra (wxGTK-specific) flags
-    bool                 m_needParent:1;        // ! wxFrame, wxDialog, wxNotebookPage ?
-    bool                 m_noExpose:1;          // wxGLCanvas has its own redrawing
-    bool                 m_nativeSizeEvent:1;   // wxGLCanvas sends wxSizeEvent upon "alloc_size"
-    bool                 m_hasScrolling:1;
-    bool                 m_hasVMT:1;
-    bool                 m_sizeSet:1;
-    bool                 m_resizing:1;
-    bool                 m_acceptsFocus:1;      // true if not static
-    bool                 m_hasFocus:1;          // true if == FindFocus()
-    bool                 m_isScrolling:1;       // dragging scrollbar thumb?
-    bool                 m_clipPaintRegion:1;   // TRUE after ScrollWindow()
-#ifdef __WXGTK20__
-    bool                 m_dirtyTabOrder:1;     // tab order changed, GTK focus
-                                                // chain needs update
-#endif
-    bool                 m_needsStyleChange:1;  // May not be able to change
-                                                // background style until OnIdle
-
-    // C++ has no virtual methods in the constrcutor of any class but we need
-    // different methods of inserting a child window into a wxFrame,
-    // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
-    wxInsertChildFunction  m_insertCallback;
-
-    // implement the base class pure virtuals
-    virtual void DoClientToScreen( int *x, int *y ) const;
-    virtual void DoScreenToClient( int *x, int *y ) const;
-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoGetClientSize( int *width, int *height ) const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
-    virtual void DoCaptureMouse();
-    virtual void DoReleaseMouse();
-
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip( wxToolTip *tip );
-#endif // wxUSE_TOOLTIPS
-
-protected:
-    // common part of all ctors (not virtual because called from ctor)
-    void Init();
-
-#ifdef __WXGTK20__
-    virtual void DoMoveInTabOrder(wxWindow *win, MoveKind move);
-
-    // Copies m_children tab order to GTK focus chain:
-    void RealizeTabOrder();
-#endif
-
-    // Called by ApplyWidgetStyle (which is called by SetFont() and
-    // SetXXXColour etc to apply style changed to native widgets) to create
-    // modified GTK style with non-standard attributes. If forceStyle=true,
-    // creates empty GtkRcStyle if there are no modifications, otherwise
-    // returns NULL in such case.
-    GtkRcStyle *CreateWidgetStyle(bool forceStyle = false);
-
-    // Overridden in many GTK widgets who have to handle subwidgets
-    virtual void ApplyWidgetStyle(bool forceStyle = false);
-
-    // helper function to ease native widgets wrapping, called by 
-    // ApplyWidgetStyle -- override this, not ApplyWidgetStyle
-    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxWindowGTK)
-    DECLARE_NO_COPY_CLASS(wxWindowGTK)
-};
-
-extern WXDLLIMPEXP_CORE wxWindow *wxFindFocusedChild(wxWindowGTK *win);
-
-#endif // __GTKWINDOWH__

include/wx/scrolwin.h

@@ -1,238 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/scrolwin.h
-// Purpose:     wxScrolledWindow, wxScrolledControl and wxScrollHelper
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     30.08.00
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SCROLWIN_H_BASE_
-#define _WX_SCROLWIN_H_BASE_
-
-#include "wx/window.h"
-
-class WXDLLEXPORT wxScrollHelperEvtHandler;
-class WXDLLEXPORT wxTimer;
-
-// ----------------------------------------------------------------------------
-// wxScrollHelper: this class implements the scrolling logic which is used by
-// wxScrolledWindow and wxScrolledControl. It is a mix-in: just derive from it
-// to implement scrolling in your class.
-// ----------------------------------------------------------------------------
-#if !defined(__WXGTK__) || defined(__WXUNIVERSAL__)
-
-class WXDLLEXPORT wxScrollHelper
-{
-public:
-    // ctor and dtor
-    wxScrollHelper(wxWindow *winToScroll = (wxWindow *)NULL);
-    void SetWindow(wxWindow *winToScroll);
-    virtual ~wxScrollHelper();
-
-    // configure the scrolling
-    virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
-                               int noUnitsX, int noUnitsY,
-                               int xPos = 0, int yPos = 0,
-                               bool noRefresh = false );
-
-    // scroll to the given (in logical coords) position
-    virtual void Scroll(int x, int y);
-
-    // get/set the page size for this orientation (wxVERTICAL/wxHORIZONTAL)
-    int GetScrollPageSize(int orient) const;
-    void SetScrollPageSize(int orient, int pageSize);
-
-    // Set the x, y scrolling increments.
-    void SetScrollRate( int xstep, int ystep );
-
-    // get the size of one logical unit in physical ones
-    virtual void GetScrollPixelsPerUnit(int *pixelsPerUnitX,
-                                        int *pixelsPerUnitY) const;
-
-    // Enable/disable Windows scrolling in either direction. If true, wxWidgets
-    // scrolls the canvas and only a bit of the canvas is invalidated; no
-    // Clear() is necessary. If false, the whole canvas is invalidated and a
-    // Clear() is necessary. Disable for when the scroll increment is used to
-    // actually scroll a non-constant distance
-    virtual void EnableScrolling(bool x_scrolling, bool y_scrolling);
-
-    // Get the view start
-    virtual void GetViewStart(int *x, int *y) const;
-
-    // Set the scale factor, used in PrepareDC
-    void SetScale(double xs, double ys) { m_scaleX = xs; m_scaleY = ys; }
-    double GetScaleX() const { return m_scaleX; }
-    double GetScaleY() const { return m_scaleY; }
-
-    // translate between scrolled and unscrolled coordinates
-    void CalcScrolledPosition(int x, int y, int *xx, int *yy) const
-        {  DoCalcScrolledPosition(x, y, xx, yy); }
-    wxPoint CalcScrolledPosition(const wxPoint& pt) const
-    {
-        wxPoint p2;
-        DoCalcScrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
-        return p2;
-    }
-
-    void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
-        {  DoCalcUnscrolledPosition(x, y, xx, yy); }
-    wxPoint CalcUnscrolledPosition(const wxPoint& pt) const
-    {
-        wxPoint p2;
-        DoCalcUnscrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
-        return p2;
-    }
-
-    virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
-    virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
-
-    // Adjust the scrollbars
-    virtual void AdjustScrollbars(void);
-
-    // Calculate scroll increment
-    virtual int CalcScrollInc(wxScrollWinEvent& event);
-
-    // Normally the wxScrolledWindow will scroll itself, but in some rare
-    // occasions you might want it to scroll [part of] another window (e.g. a
-    // child of it in order to scroll only a portion the area between the
-    // scrollbars (spreadsheet: only cell area will move).
-    virtual void SetTargetWindow(wxWindow *target);
-    virtual wxWindow *GetTargetWindow() const;
-
-    void SetTargetRect(const wxRect& rect) { m_rectToScroll = rect; }
-    wxRect GetTargetRect() const { return m_rectToScroll; }
-
-    // Override this function to draw the graphic (or just process EVT_PAINT)
-    virtual void OnDraw(wxDC& WXUNUSED(dc)) { }
-
-    // change the DC origin according to the scroll position.
-    virtual void DoPrepareDC(wxDC& dc);
-
-    // are we generating the autoscroll events?
-    bool IsAutoScrolling() const { return m_timerAutoScroll != NULL; }
-
-    // stop generating the scroll events when mouse is held outside the window
-    void StopAutoScrolling();
-
-    // this method can be overridden in a derived class to forbid sending the
-    // auto scroll events - note that unlike StopAutoScrolling() it doesn't
-    // stop the timer, so it will be called repeatedly and will typically
-    // return different values depending on the current mouse position
-    //
-    // the base class version just returns true
-    virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const;
-
-    // the methods to be called from the window event handlers
-    void HandleOnScroll(wxScrollWinEvent& event);
-    void HandleOnSize(wxSizeEvent& event);
-    void HandleOnPaint(wxPaintEvent& event);
-    void HandleOnChar(wxKeyEvent& event);
-    void HandleOnMouseEnter(wxMouseEvent& event);
-    void HandleOnMouseLeave(wxMouseEvent& event);
-#if wxUSE_MOUSEWHEEL
-    void HandleOnMouseWheel(wxMouseEvent& event);
-#endif // wxUSE_MOUSEWHEEL
-
-    // FIXME: this is needed for now for wxPlot compilation, should be removed
-    //        once it is fixed!
-    void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); }
-
-protected:
-    // get pointer to our scroll rect if we use it or NULL
-    const wxRect *GetScrollRect() const
-    {
-        return m_rectToScroll.width != 0 ? &m_rectToScroll : NULL;
-    }
-
-    // get the size of the target window
-    wxSize GetTargetSize() const
-    {
-        return m_rectToScroll.width != 0 ? m_rectToScroll.GetSize()
-                                         : m_targetWindow->GetClientSize();
-    }
-
-    void GetTargetSize(int *w, int *h)
-    {
-        wxSize size = GetTargetSize();
-        if ( w )
-            *w = size.x;
-        if ( h )
-            *h = size.y;
-    }
-
-    // change just the target window (unlike SetWindow which changes m_win as
-    // well)
-    void DoSetTargetWindow(wxWindow *target);
-
-    // delete the event handler we installed
-    void DeleteEvtHandler();
-
-    double                m_scaleX;
-    double                m_scaleY;
-
-    wxWindow             *m_win,
-                         *m_targetWindow;
-
-    wxRect                m_rectToScroll;
-
-    wxTimer              *m_timerAutoScroll;
-
-    int                   m_xScrollPixelsPerLine;
-    int                   m_yScrollPixelsPerLine;
-    int                   m_xScrollPosition;
-    int                   m_yScrollPosition;
-    int                   m_xScrollLines;
-    int                   m_yScrollLines;
-    int                   m_xScrollLinesPerPage;
-    int                   m_yScrollLinesPerPage;
-
-    bool                  m_xScrollingEnabled;
-    bool                  m_yScrollingEnabled;
-
-#if wxUSE_MOUSEWHEEL
-    int m_wheelRotation;
-#endif // wxUSE_MOUSEWHEEL
-
-    wxScrollHelperEvtHandler *m_handler;
-
-    DECLARE_NO_COPY_CLASS(wxScrollHelper)
-};
-
-#endif
-
-// ----------------------------------------------------------------------------
-// wxScrolledWindow: a wxWindow which knows how to scroll
-// ----------------------------------------------------------------------------
-
-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
-    #include "wx/gtk/scrolwin.h"
-#else // !wxGTK
-    #include "wx/generic/scrolwin.h"
-
-    class WXDLLEXPORT wxScrolledWindow : public wxGenericScrolledWindow
-    {
-    public:
-        wxScrolledWindow() { }
-        wxScrolledWindow(wxWindow *parent,
-                         wxWindowID winid = wxID_ANY,
-                         const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& size = wxDefaultSize,
-                         long style = wxScrolledWindowStyle,
-                         const wxString& name = wxPanelNameStr)
-            : wxGenericScrolledWindow(parent, winid, pos, size, style, name)
-        {
-        }
-
-    private:
-        DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow)
-    };
-
-    #define wxSCROLLED_WINDOW_IS_GENERIC 1
-#endif
-
-#endif
-    // _WX_SCROLWIN_H_BASE_
-

src/generic/panelg.cpp

@@ -0,0 +1,170 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        panelg.cpp
+// Purpose:     wxPanel
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart and Markus Holzem
+// Licence:           wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "panelg.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/object.h"
+#include "wx/font.h"
+#include "wx/colour.h"
+#include "wx/settings.h"
+#endif
+
+#include "wx/generic/panelg.h"
+
+#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
+
+BEGIN_EVENT_TABLE(wxPanel, wxWindow)
+  EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
+  EVT_SET_FOCUS(wxPanel::OnFocus)
+  EVT_NAVIGATION_KEY(wxPanel::OnNavigationKey)
+END_EVENT_TABLE()
+
+#endif
+
+wxPanel::wxPanel()
+{
+    m_lastFocus = NULL;
+}
+
+bool wxPanel::Create(wxWindow *parent, wxWindowID id,
+                     const wxPoint& pos,
+                     const wxSize& size,
+                     long style,
+                     const wxString& name)
+{
+    m_lastFocus = NULL;
+
+    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+
+    if ( ret )
+    {
+#ifndef __WXGTK__
+        SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+        SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+#endif
+    }
+
+    return ret;
+}
+
+void wxPanel::InitDialog(void)
+{
+    wxInitDialogEvent event(GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+
+// Responds to colour changes, and passes event on to children.
+void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    Refresh();
+
+    // Propagate the event to the non-top-level children
+    wxWindow::OnSysColourChanged(event);
+}
+
+void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
+{
+    // there is not much to do if we have only one child (or not at all)
+    if (GetChildren().GetCount() < 2)
+    {
+        event.Skip();
+        return;
+    }
+
+    // don't process these ones here
+    if (event.IsWindowChange())
+    {
+        event.Skip();
+        return;
+    }
+
+    wxWindow *winFocus = event.GetCurrentFocus();
+    if (!winFocus)
+        winFocus = wxWindow::FindFocus();
+
+    if (!winFocus)
+    {
+        event.Skip();
+        return;
+    }
+
+    wxNode *start_node = GetChildren().Find( winFocus );
+    if (!start_node)
+        start_node = GetChildren().First();
+
+    wxNode *node = event.GetDirection() ? start_node->Next()
+                                        : start_node->Previous();
+
+    while (node != start_node)
+    {
+        if (!node)
+        {
+//#if 0 // FIXME seems to enter in an infinite loop - how is this possible?
+            // we arrived at the last/first of our children - but may be this
+            // panel is inside another panel, so make focus go to the next/prev
+            // control in the parent (if we have one)
+            if (GetParent() != NULL)
+            {
+                wxNavigationKeyEvent new_event;
+                new_event.SetDirection( event.GetDirection() );
+                new_event.SetWindowChange(FALSE);
+                new_event.SetCurrentFocus( this );
+
+                if (GetParent()->GetEventHandler()->ProcessEvent(new_event))
+                {
+                    return;
+                }
+            }
+//#endif // 0
+
+            node = event.GetDirection() ? GetChildren().First()
+                                        : GetChildren().Last();
+
+            continue;
+        }
+
+        wxWindow *child = (wxWindow *)node->Data();
+
+        if (child->AcceptsFocus())
+        {
+            // ok, event processed
+            child->SetFocus();
+            return;
+        }
+
+        node = event.GetDirection() ? node->Next() : node->Previous();
+    }
+
+    // we cycled through all of our children and none of them wanted to accept
+    // focus
+    event.Skip();
+}
+
+void wxPanel::OnFocus(wxFocusEvent& event)
+{
+    if ( m_lastFocus )
+        m_lastFocus->SetFocus();
+    else
+        event.Skip();
+}

src/msw/control.cpp

@@ -0,0 +1,330 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        control.cpp
+// Purpose:     wxControl class
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart and Markus Holzem
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "control.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/event.h"
+#include "wx/app.h"
+#include "wx/dcclient.h"
+#endif
+
+#include "wx/control.h"
+
+#include "wx/msw/private.h"
+
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#include <commctrl.h>
+#endif
+
+#ifdef GetCharWidth
+#undef GetCharWidth
+#undef GetWindowProc
+#endif
+
+#if !USE_SHARED_LIBRARY
+IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
+
+BEGIN_EVENT_TABLE(wxControl, wxWindow)
+	EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
+END_EVENT_TABLE()
+#endif
+
+// Item members
+wxControl::wxControl(void)
+{
+  m_backgroundColour = *wxWHITE;
+  m_foregroundColour = *wxBLACK;
+  m_callback = 0;
+}
+
+wxControl::~wxControl(void)
+{
+  m_isBeingDeleted = TRUE;
+
+  // If we delete an item, we should initialize the parent panel,
+  // because it could now be invalid.
+  wxWindow *parent = (wxWindow *)GetParent();
+  if (parent)
+  {
+    if (parent->GetDefaultItem() == (wxButton*) this)
+        parent->SetDefaultItem(NULL);
+  }
+}
+
+void wxControl::SetLabel(const wxString& label)
+{
+  if (GetHWND())
+    SetWindowText((HWND) GetHWND(), (const char *)label);
+}
+
+wxString wxControl::GetLabel(void) const
+{
+    wxBuffer[0] = 0;
+    if (GetHWND())
+    {
+        int len = GetWindowText((HWND)GetHWND(), wxBuffer, 256);
+        wxBuffer[len] = 0;
+    }
+
+  return wxString(wxBuffer);
+}
+
+// Call this repeatedly for several wnds to find the overall size
+// of the widget.
+// Call it initially with -1 for all values in rect.
+// Keep calling for other widgets, and rect will be modified
+// to calculate largest bounding rectangle.
+void wxFindMaxSize(WXHWND wnd, RECT *rect)
+{
+  int left = rect->left;
+  int right = rect->right;
+  int top = rect->top;
+  int bottom = rect->bottom;
+
+  GetWindowRect((HWND) wnd, rect);
+
+  if (left < 0)
+    return;
+
+  if (left < rect->left)
+    rect->left = left;
+
+  if (right > rect->right)
+    rect->right = right;
+
+  if (top < rect->top)
+    rect->top = top;
+
+  if (bottom > rect->bottom)
+    rect->bottom = bottom;
+
+}
+
+/*
+// Not currently used
+void wxConvertDialogToPixels(wxWindow *control, int *x, int *y)
+{
+  if (control->m_windowParent && control->m_windowParent->is_dialog)
+  {
+    DWORD word = GetDialogBaseUnits();
+    int xs = LOWORD(word);
+    int ys = HIWORD(word);
+    *x = (int)(*x * xs/4);
+    *y = (int)(*y * ys/8);
+  }
+  else
+  {
+    *x = *x;
+    *y = *y;
+  }
+}
+*/
+
+void wxControl::MSWOnMouseMove(int x, int y, WXUINT flags)
+{
+/*
+  // Trouble with this is that it sets the cursor for controls too :-(
+  if (m_windowCursor.Ok() && !wxIsBusy())
+    ::SetCursor(m_windowCursor.GetHCURSOR());
+*/
+
+  if (!m_mouseInWindow)
+  {
+    // Generate an ENTER event
+    m_mouseInWindow = TRUE;
+    MSWOnMouseEnter(x, y, flags);
+  }
+
+  wxMouseEvent event(wxEVT_MOTION);
+
+  event.m_x = x; event.m_y = y;
+  event.m_shiftDown = ((flags & MK_SHIFT) != 0);
+  event.m_controlDown = ((flags & MK_CONTROL) != 0);
+  event.m_leftDown = ((flags & MK_LBUTTON) != 0);
+  event.m_middleDown = ((flags & MK_MBUTTON) != 0);
+  event.m_rightDown = ((flags & MK_RBUTTON) != 0);
+  event.SetTimestamp(wxApp::sm_lastMessageTime);
+  event.SetEventObject( this );
+
+  // Window gets a click down message followed by a mouse move
+  // message even if position isn't changed!  We want to discard
+  // the trailing move event if x and y are the same.
+  if ((m_lastEvent == wxEVT_RIGHT_DOWN || m_lastEvent == wxEVT_LEFT_DOWN ||
+       m_lastEvent == wxEVT_MIDDLE_DOWN) &&
+      (m_lastXPos == event.GetX() && m_lastYPos == event.GetY()))
+  {
+    m_lastXPos = event.GetX(); m_lastYPos = event.GetY();
+    m_lastEvent = wxEVT_MOTION;
+    return;
+  }
+
+  m_lastEvent = wxEVT_MOTION;
+  m_lastXPos = event.GetX(); m_lastYPos = event.GetY();
+
+  if (!GetEventHandler()->ProcessEvent(event))
+    Default();
+}
+
+bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
+                          WXLPARAM* result)
+{
+#if defined(__WIN95__)
+	wxCommandEvent event(wxEVT_NULL, m_windowId);
+	wxEventType eventType = wxEVT_NULL;
+	NMHDR *hdr1 = (NMHDR*) lParam;
+	switch ( hdr1->code )
+	{
+		case NM_CLICK:
+		{
+			eventType = wxEVT_COMMAND_LEFT_CLICK;
+			break;
+		}
+		case NM_DBLCLK:
+		{
+			eventType = wxEVT_COMMAND_LEFT_DCLICK;
+			break;
+		}
+		case NM_RCLICK:
+		{
+			eventType = wxEVT_COMMAND_RIGHT_CLICK;
+			break;
+		}
+		case NM_RDBLCLK:
+		{
+			eventType = wxEVT_COMMAND_RIGHT_DCLICK;
+			break;
+		}
+		case NM_SETFOCUS:
+		{
+			eventType = wxEVT_COMMAND_SET_FOCUS;
+			break;
+		}
+		case NM_KILLFOCUS:
+		{
+			eventType = wxEVT_COMMAND_KILL_FOCUS;
+			break;
+		}
+		case NM_RETURN:
+		{
+			eventType = wxEVT_COMMAND_ENTER;
+			break;
+		}
+/* Not implemented
+		case NM_OUTOFMEMORY:
+		{
+			eventType = wxEVT_COMMAND_OUT_OF_MEMORY;
+			break;
+		}
+*/
+		default:
+            return wxWindow::MSWNotify(wParam, lParam, result);
+	}
+
+    event.SetEventType(eventType);
+	event.SetEventObject(this);
+
+	if ( !GetEventHandler()->ProcessEvent(event) )
+		return FALSE;
+	return TRUE;
+#else   // !Win95
+    return FALSE;
+#endif
+}
+
+/*
+ * Allocates control IDs within the appropriate range
+ */
+
+
+int NewControlId(void)
+{
+  static int controlId = 0;
+  controlId ++;
+  return controlId;
+}
+
+void wxControl::ProcessCommand (wxCommandEvent & event)
+{
+  // Tries:
+  // 1) A callback function (to become obsolete)
+  // 2) OnCommand, starting at this window and working up parent hierarchy
+  // 3) OnCommand then calls ProcessEvent to search the event tables.
+  if (m_callback)
+    {
+      (void) (*(m_callback)) (*this, event);
+    }
+    else
+    {
+      GetEventHandler()->OnCommand(*this, event);
+    }
+}
+
+void wxControl::OnEraseBackground(wxEraseEvent& event)
+{
+  // In general, you don't want to erase the background of a control,
+  // or you'll get a flicker.
+  // TODO: move this 'null' function into each control that
+  // might flicker.
+
+  RECT rect;
+  ::GetClientRect((HWND) GetHWND(), &rect);
+
+  HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
+  int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT);
+
+  ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush);
+  ::DeleteObject(hBrush);
+  ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
+}
+
+void wxControl::SetClientSize (int width, int height)
+{
+  SetSize (-1, -1, width, height);
+}
+
+void wxControl::Centre (int direction)
+{
+  int x, y, width, height, panel_width, panel_height, new_x, new_y;
+
+  wxWindow *parent = (wxWindow *) GetParent ();
+  if (!parent)
+    return;
+
+  parent->GetClientSize (&panel_width, &panel_height);
+  GetSize (&width, &height);
+  GetPosition (&x, &y);
+
+  new_x = x;
+  new_y = y;
+
+  if (direction & wxHORIZONTAL)
+    new_x = (int) ((panel_width - width) / 2);
+
+  if (direction & wxVERTICAL)
+    new_y = (int) ((panel_height - height) / 2);
+
+  SetSize (new_x, new_y, width, height);
+  int temp_x, temp_y;
+  GetPosition (&temp_x, &temp_y);
+  GetPosition (&temp_x, &temp_y);
+}
+
+