Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OS/2 scrolling support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-02-04 04:19:14 +00:00
parent cafbad8f17
commit 45e0dc9477
10 changed files with 344 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/os2/region.h
View File

@@ -33,8 +33,6 @@ enum wxRegionOp { wxRGN_AND // Creates the intersection of the two combi
class WXDLLEXPORT wxRegion : public wxGDIObject
{
DECLARE_DYNAMIC_CLASS(wxRegion);
friend class WXDLLEXPORT wxRegionIterator;
public:
wxRegion( wxCoord x
,wxCoord y
@@ -67,6 +65,10 @@ public:
//
void Clear(void);
bool Offset( wxCoord x
,wxCoord y
);
//
// Union rectangle or region with this.
//
@@ -208,6 +210,14 @@ public:
//
WXHRGN GetHRGN(void) const;
void SetPS(HPS hPS);
protected:
virtual wxObjectRefData* CreateData(void) const;
virtual wxObjectRefData* CloneData(wxObjectRefData* pData) const;
friend class WXDLLEXPORT wxRegionIterator;
DECLARE_DYNAMIC_CLASS(wxRegion);
}; // end of CLASS wxRegion
class WXDLLEXPORT wxRegionIterator : public wxObject

3
include/wx/os2/toplevel.h
View File

@@ -85,8 +85,10 @@ public:
//
virtual void AlterChildPos(void); // OS/2 child control positioning
virtual void UpdateInternalSize( wxWindow* pChild
,int nWidth
,int nHeight
);
PSWP GetSwpClient(void) { return &m_vSwpClient; }
protected:
//
// Common part of all ctors
@@ -157,6 +159,7 @@ protected:
WXHWND m_hFrame;
SWP m_vSwp;
SWP m_vSwpClient;
static bool m_sbInitialized;
}; // end of CLASS wxTopLevelWindowOS2
//

5
include/wx/os2/window.h
View File

@@ -142,6 +142,8 @@ public:
,const wxRect* pRect = (wxRect *)NULL
);
inline HWND GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;}
inline HWND GetScrollBarVert(void) const {return m_hWndScrollBarVert;};
#if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget(wxDropTarget* pDropTarget);
#endif // wxUSE_DRAG_AND_DROP
@@ -539,6 +541,7 @@ protected:
#endif // wxUSE_TOOLTIPS
int GetOS2ParentHeight(wxWindowOS2* pParent);
virtual void OS2Layout(int nWidth, int nHeight);
private:
// common part of all ctors
@@ -561,9 +564,11 @@ private:
// the helper functions used by HandleChar/KeyXXX methods
wxKeyEvent CreateKeyEvent(wxEventType evType, int id, WXLPARAM lp) const;
DECLARE_DYNAMIC_CLASS(wxWindowOS2);
DECLARE_NO_COPY_CLASS(wxWindowOS2)
DECLARE_EVENT_TABLE()
private:
HWND m_hWndScrollBarHorz;
HWND m_hWndScrollBarVert;