first pass of wxUniv merge - nothing works, most parts don't even compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions

View File

@@ -1,12 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: slidrmsw.h
// Name: wx/msw/slidrmsw.h
// Purpose: wxSliderMSW class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _SLIDRMSW_H_
@@ -16,15 +16,9 @@
#pragma interface "slidrmsw.h"
#endif
#include "wx/control.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
// Slider
class WXDLLEXPORT wxSliderMSW : public wxControl
class WXDLLEXPORT wxSliderMSW : public wxSliderBase
{
DECLARE_DYNAMIC_CLASS(wxSliderMSW)
public:
wxSliderMSW();
@@ -49,11 +43,11 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr);
virtual int GetValue() const ;
virtual int GetValue() const;
virtual void SetValue(int);
void GetSize(int *x, int *y) const ;
void GetPosition(int *x, int *y) const ;
void GetSize(int *x, int *y) const;
void GetPosition(int *x, int *y) const;
bool Show(bool show);
@@ -63,20 +57,10 @@ public:
int GetMax() const { return m_rangeMax; }
// For trackbars only
void SetTickFreq(int n, int pos);
int GetTickFreq() const { return m_tickFreq; }
void SetPageSize(int pageSize);
int GetPageSize() const ;
void ClearSel() ;
void ClearTicks() ;
int GetPageSize() const;
void SetLineSize(int lineSize);
int GetLineSize() const ;
int GetSelEnd() const ;
int GetSelStart() const ;
void SetSelection(int minPos, int maxPos);
void SetThumbLength(int len) ;
int GetThumbLength() const ;
void SetTick(int tickPos) ;
int GetLineSize() const;
// IMPLEMENTATION
WXHWND GetStaticMin() const { return m_staticMin; }
@@ -98,11 +82,12 @@ protected:
int m_rangeMax;
int m_pageSize;
int m_lineSize;
int m_tickFreq;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
DECLARE_DYNAMIC_CLASS(wxSliderMSW)
};
#endif