Use wxScrollWinEvent instead of wxScrollEvent in

wxWindow and wxScrolledWindow. This breaks all ports!
  Added Layout() call to wxSplitter.
  wxDialog at least tries to set its position before its
    shown.
  wxGTK now emits char/key events as wxMSW does.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-17 19:17:28 +00:00
parent 9111db6802
commit c5b42c871b
11 changed files with 605 additions and 451 deletions

View File

@@ -25,7 +25,7 @@ class WXDLLEXPORT wxScrolledWindow: public wxWindow
DECLARE_ABSTRACT_CLASS(wxScrolledWindow)
public:
wxScrolledWindow(void);
wxScrolledWindow();
inline wxScrolledWindow(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -35,7 +35,7 @@ public:
Create(parent, id, pos, size, style, name);
}
inline ~wxScrolledWindow(void) {}
~wxScrolledWindow() {}
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
@@ -94,7 +94,7 @@ public:
// Adjust the scrollbars
virtual void AdjustScrollbars(void);
void OnScroll(wxScrollEvent& event);
void OnScroll(wxScrollWinEvent& event);
void OnSize(wxSizeEvent& event);
void OnPaint(wxPaintEvent& event);
@@ -106,14 +106,11 @@ public:
virtual void PrepareDC(wxDC& dc);
public:
////////////////////////////////////////////////////////////////////////
//// IMPLEMENTATION
// IMPLEMENTATION
// Calculate scroll increment
virtual int CalcScrollInc(wxScrollEvent& event);
virtual int CalcScrollInc(wxScrollWinEvent& event);
////////////////////////////////////////////////////////////////////////
//// PROTECTED DATA
protected:
int m_xScrollPixelsPerLine;
int m_yScrollPixelsPerLine;
@@ -131,8 +128,5 @@ protected:
DECLARE_EVENT_TABLE()
};
////////////////////////////////////////////////////////////////////////
//// INLINES
#endif
// __SCROLWINH_G__