Removed 16-bit gauge code (Microsoft)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -77,9 +77,7 @@ protected:
|
|||||||
#define wxGauge wxGauge95
|
#define wxGauge wxGauge95
|
||||||
#define sm_classwxGauge sm_classwxGauge95
|
#define sm_classwxGauge sm_classwxGauge95
|
||||||
#else // !__WIN95__
|
#else // !__WIN95__
|
||||||
#include "wx/msw/gaugemsw.h"
|
// Gauge no longer supported on 16-bit Windows
|
||||||
#define wxGauge wxGaugeMSW
|
|
||||||
#define sm_classwxGauge sm_classwxGaugeMSW
|
|
||||||
#endif
|
#endif
|
||||||
#elif defined(__WXMOTIF__)
|
#elif defined(__WXMOTIF__)
|
||||||
#include "wx/motif/gauge.h"
|
#include "wx/motif/gauge.h"
|
||||||
|
@@ -1,79 +0,0 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Name: gaugemsw.h
|
|
||||||
// Purpose: wxGauge class
|
|
||||||
// Author: Julian Smart
|
|
||||||
// Modified by:
|
|
||||||
// Created: 01/02/97
|
|
||||||
// RCS-ID: $Id$
|
|
||||||
// Copyright: (c) Julian Smart
|
|
||||||
// Licence: wxWindows licence
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
#ifndef _GAUGEMSW_H_
|
|
||||||
#define _GAUGEMSW_H_
|
|
||||||
|
|
||||||
#ifdef __GNUG__
|
|
||||||
#pragma interface "gaugemsw.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "wx/control.h"
|
|
||||||
|
|
||||||
WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
|
|
||||||
|
|
||||||
// Group box
|
|
||||||
class WXDLLEXPORT wxGaugeMSW: public wxControl
|
|
||||||
{
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxGaugeMSW)
|
|
||||||
|
|
||||||
public:
|
|
||||||
wxGaugeMSW(void) { m_rangeMax = 0; m_gaugePos = 0; }
|
|
||||||
|
|
||||||
wxGaugeMSW(wxWindow *parent, wxWindowID id,
|
|
||||||
int range,
|
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
|
||||||
const wxSize& size = wxDefaultSize,
|
|
||||||
long style = wxGA_HORIZONTAL,
|
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
|
||||||
const wxString& name = wxGaugeNameStr)
|
|
||||||
{
|
|
||||||
Create(parent, id, range, pos, size, style, validator, name);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
|
||||||
int range,
|
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
|
||||||
const wxSize& size = wxDefaultSize,
|
|
||||||
long style = wxGA_HORIZONTAL,
|
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
|
||||||
const wxString& name = wxGaugeNameStr);
|
|
||||||
|
|
||||||
void SetShadowWidth(int w);
|
|
||||||
void SetBezelFace(int w);
|
|
||||||
void SetRange(int r);
|
|
||||||
void SetValue(int pos);
|
|
||||||
|
|
||||||
int GetShadowWidth(void) const ;
|
|
||||||
int GetBezelFace(void) const ;
|
|
||||||
int GetRange(void) const ;
|
|
||||||
int GetValue(void) const ;
|
|
||||||
|
|
||||||
bool SetForegroundColour(const wxColour& col);
|
|
||||||
bool SetBackgroundColour(const wxColour& col);
|
|
||||||
|
|
||||||
// overriden base class virtuals
|
|
||||||
virtual bool AcceptsFocus() const { return FALSE; }
|
|
||||||
|
|
||||||
// Backward compatibility
|
|
||||||
#if WXWIN_COMPATIBILITY
|
|
||||||
void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
|
|
||||||
|
|
||||||
protected:
|
|
||||||
int m_rangeMax;
|
|
||||||
int m_gaugePos;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
// _GAUGEMSW_H_
|
|
@@ -576,7 +576,6 @@ ALL_HEADERS = \
|
|||||||
msw/fontdlg.h \
|
msw/fontdlg.h \
|
||||||
msw/frame.h \
|
msw/frame.h \
|
||||||
msw/gauge95.h \
|
msw/gauge95.h \
|
||||||
msw/gaugemsw.h \
|
|
||||||
msw/gccpriv.h \
|
msw/gccpriv.h \
|
||||||
msw/gdiimage.h \
|
msw/gdiimage.h \
|
||||||
msw/gdiobj.h \
|
msw/gdiobj.h \
|
||||||
|
1162
src/msw/gaugemsw.cpp
1162
src/msw/gaugemsw.cpp
File diff suppressed because it is too large
Load Diff
@@ -256,7 +256,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
|
|||||||
$(MSWDIR)\fontenum.obj \
|
$(MSWDIR)\fontenum.obj \
|
||||||
$(MSWDIR)\fontutil.obj \
|
$(MSWDIR)\fontutil.obj \
|
||||||
$(MSWDIR)\frame.obj \
|
$(MSWDIR)\frame.obj \
|
||||||
$(MSWDIR)\gaugemsw.obj \
|
|
||||||
$(MSWDIR)\gdiimage.obj \
|
$(MSWDIR)\gdiimage.obj \
|
||||||
$(MSWDIR)\gdiobj.obj \
|
$(MSWDIR)\gdiobj.obj \
|
||||||
$(MSWDIR)\glcanvas.obj \
|
$(MSWDIR)\glcanvas.obj \
|
||||||
@@ -410,8 +409,6 @@ $(MSWDIR)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF)
|
|||||||
|
|
||||||
$(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
|
$(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
|
||||||
|
|
||||||
$(MSWDIR)\gaugemsw.obj: $(MSWDIR)\gaugemsw.$(SRCSUFF)
|
|
||||||
|
|
||||||
$(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
|
$(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
|
||||||
|
|
||||||
$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
|
$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
|
||||||
|
@@ -244,7 +244,6 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \
|
|||||||
$(MSWDIR)\fontenum.obj \
|
$(MSWDIR)\fontenum.obj \
|
||||||
$(MSWDIR)\fontutil.obj \
|
$(MSWDIR)\fontutil.obj \
|
||||||
$(MSWDIR)\frame.obj \
|
$(MSWDIR)\frame.obj \
|
||||||
$(MSWDIR)\gaugemsw.obj \
|
|
||||||
$(MSWDIR)\gdiimage.obj \
|
$(MSWDIR)\gdiimage.obj \
|
||||||
$(MSWDIR)\gdiobj.obj \
|
$(MSWDIR)\gdiobj.obj \
|
||||||
$(MSWDIR)\glcanvas.obj \
|
$(MSWDIR)\glcanvas.obj \
|
||||||
@@ -543,11 +542,6 @@ $(MSWDIR)/frame.obj: $*.$(SRCSUFF)
|
|||||||
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
|
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
|
||||||
<<
|
<<
|
||||||
|
|
||||||
$(MSWDIR)/gaugemsw.obj: $*.$(SRCSUFF)
|
|
||||||
cl @<<
|
|
||||||
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
|
|
||||||
<<
|
|
||||||
|
|
||||||
$(MSWDIR)/gdiimage.obj: $*.$(SRCSUFF)
|
$(MSWDIR)/gdiimage.obj: $*.$(SRCSUFF)
|
||||||
cl @<<
|
cl @<<
|
||||||
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
|
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
; Last change: JS 23 Mar 103 3:25 pm
|
||||||
|
|
||||||
|
|
||||||
# This file was automatically generated by tmake
|
# This file was automatically generated by tmake
|
||||||
@@ -237,7 +238,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
|
|||||||
$(MSWDIR)\fontutil.obj \
|
$(MSWDIR)\fontutil.obj \
|
||||||
$(MSWDIR)\frame.obj \
|
$(MSWDIR)\frame.obj \
|
||||||
$(MSWDIR)\gauge95.obj \
|
$(MSWDIR)\gauge95.obj \
|
||||||
$(MSWDIR)\gaugemsw.obj \
|
|
||||||
$(MSWDIR)\gdiimage.obj \
|
$(MSWDIR)\gdiimage.obj \
|
||||||
$(MSWDIR)\gdiobj.obj \
|
$(MSWDIR)\gdiobj.obj \
|
||||||
$(MSWDIR)\glcanvas.obj \
|
$(MSWDIR)\glcanvas.obj \
|
||||||
|
@@ -141,7 +141,6 @@ MSWOBJS = \
|
|||||||
fontdlg.obj \
|
fontdlg.obj \
|
||||||
frame.obj \
|
frame.obj \
|
||||||
gauge95.obj \
|
gauge95.obj \
|
||||||
gaugemsw.obj \
|
|
||||||
gdiobj.obj \
|
gdiobj.obj \
|
||||||
helpwin.obj \
|
helpwin.obj \
|
||||||
icon.obj \
|
icon.obj \
|
||||||
@@ -326,9 +325,6 @@ frame.obj: $(MSWDIR)\frame.cpp
|
|||||||
gauge95.obj: $(MSWDIR)\gauge95.cpp
|
gauge95.obj: $(MSWDIR)\gauge95.cpp
|
||||||
$(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gauge95.cpp /BINARY gauge95.obj
|
$(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gauge95.cpp /BINARY gauge95.obj
|
||||||
|
|
||||||
gaugemsw.obj: $(MSWDIR)\gaugemsw.cpp
|
|
||||||
$(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gaugemsw.cpp /BINARY gaugemsw.obj
|
|
||||||
|
|
||||||
gdiobj.obj: $(MSWDIR)\gdiobj.cpp
|
gdiobj.obj: $(MSWDIR)\gdiobj.cpp
|
||||||
$(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gdiobj.cpp /BINARY gdiobj.obj
|
$(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gdiobj.cpp /BINARY gdiobj.obj
|
||||||
|
|
||||||
|
@@ -179,7 +179,6 @@ MSWOBJS = \
|
|||||||
font.$(OBJSUFF) \
|
font.$(OBJSUFF) \
|
||||||
fontdlg.$(OBJSUFF) \
|
fontdlg.$(OBJSUFF) \
|
||||||
frame.$(OBJSUFF) \
|
frame.$(OBJSUFF) \
|
||||||
gaugemsw.$(OBJSUFF) \
|
|
||||||
gauge95.$(OBJSUFF) \
|
gauge95.$(OBJSUFF) \
|
||||||
gdiobj.$(OBJSUFF) \
|
gdiobj.$(OBJSUFF) \
|
||||||
helpwin.$(OBJSUFF) \
|
helpwin.$(OBJSUFF) \
|
||||||
|
@@ -46,7 +46,6 @@ addobj fontdlg.obj
|
|||||||
addobj frame.obj
|
addobj frame.obj
|
||||||
addobj framecmn.obj
|
addobj framecmn.obj
|
||||||
addobj gauge95.obj
|
addobj gauge95.obj
|
||||||
addobj gaugemsw.obj
|
|
||||||
addobj gdicmn.obj
|
addobj gdicmn.obj
|
||||||
addobj gdiobj.obj
|
addobj gdiobj.obj
|
||||||
addobj gridg.obj
|
addobj gridg.obj
|
||||||
|
@@ -2651,10 +2651,6 @@ SOURCE=..\include\wx\msw\gauge95.h
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\include\wx\msw\gaugemsw.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\include\wx\msw\gccpriv.h
|
SOURCE=..\include\wx\msw\gccpriv.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
Reference in New Issue
Block a user