compilation fixes - wxGTK compiles but not links

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-26 21:29:16 +00:00
parent 21aeca5e54
commit 29149a6491
13 changed files with 80 additions and 165 deletions

View File

@@ -39,7 +39,7 @@ class WXDLLEXPORT wxScrolledWindow : public wxPanel
public:
wxScrolledWindow()
{ Init(); }
wxScrolledWindow(wxWindow *parent,
wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
@@ -47,7 +47,7 @@ public:
long style = wxScrolledWindowStyle,
const wxString& name = wxPanelNameStr)
{ Create(parent, id, pos, size, style, name); }
void Init();
bool Create(wxWindow *parent,
@@ -110,7 +110,7 @@ public:
// 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; }
@@ -121,7 +121,7 @@ public:
void OnSize(wxSizeEvent& event);
void OnPaint(wxPaintEvent& event);
void OnChar(wxKeyEvent& event);
void GtkVScroll( float value );
void GtkHScroll( float value );
void GtkVConnectEvent();
@@ -131,10 +131,10 @@ public:
// Calculate scroll increment
virtual int CalcScrollInc(wxScrollWinEvent& event);
// Overridden from wxWindows due callback being static
virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
protected:
wxWindow *m_targetWindow;
int m_xScrollPixelsPerLine;
@@ -147,7 +147,7 @@ protected:
int m_yScrollLines;
int m_xScrollLinesPerPage;
int m_yScrollLinesPerPage;
double m_scaleY,m_scaleX;
private: