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

More deprecated class mods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-03-31 10:24:36 +00:00
parent f2638c97a5
commit 7c9955d147
103 changed files with 466 additions and 11735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/configure vendored
View File

@@ -700,10 +700,8 @@ trap 'rm -fr `echo "
ownerdrw/Makefile
png/Makefile
printing/Makefile
proplist/Makefile
propsize/Makefile
regtest/Makefile
resource/Makefile
rotate/Makefile
sashtest/Makefile
shaped/Makefile
@@ -717,7 +715,6 @@ trap 'rm -fr `echo "
thread/Makefile
toolbar/Makefile
treectrl/Makefile
treelay/Makefile
typetest/Makefile
validate/Makefile
widgets/Makefile

3
samples/configure.in
View File

@@ -70,10 +70,8 @@ AC_OUTPUT([
ownerdrw/Makefile
png/Makefile
printing/Makefile
proplist/Makefile
propsize/Makefile
regtest/Makefile
resource/Makefile
rotate/Makefile
sashtest/Makefile
shaped/Makefile
@@ -87,7 +85,6 @@ AC_OUTPUT([
thread/Makefile
toolbar/Makefile
treectrl/Makefile
treelay/Makefile
typetest/Makefile
validate/Makefile
widgets/Makefile

50
samples/dnd/dnd.cpp
View File

@@ -29,12 +29,6 @@
#define USE_METAFILES
#endif // Windows
#define USE_RESOURCES 0
#if !wxUSE_RESOURCES
#undef USE_RESOURCES
#define USE_RESOURCES 0
#endif
#include "wx/intl.h"
#include "wx/log.h"
@@ -44,11 +38,7 @@
#include "wx/image.h"
#include "wx/clipbrd.h"
#include "wx/colordlg.h"
#if USE_RESOURCES
#include "wx/resource.h"
#else
#include "wx/sizer.h"
#endif
#include "wx/sizer.h"
#ifdef USE_METAFILES
#include "wx/metafile.h"
@@ -347,7 +337,7 @@ protected:
//get a point 1 up and 1 left, otherwise the mid-point of a triangle is on the line
wxPoint GetCentre() const
{ return wxPoint(m_pos.x + m_size.x / 2 - 1, m_pos.y + m_size.y / 2 - 1); }
struct ShapeDump
{
int x, y, // position
@@ -393,7 +383,7 @@ public:
dc.DrawLine(p3, p1);
//works in multicolor modes; on GTK (at least) will fail in 16-bit color
dc.SetBrush(wxBrush(m_col, wxSOLID));
dc.SetBrush(wxBrush(m_col, wxSOLID));
dc.FloodFill(GetCentre(), m_col, wxFLOOD_BORDER);
}
};
@@ -874,27 +864,6 @@ END_EVENT_TABLE()
// `Main program' equivalent, creating windows and returning main app frame
bool DnDApp::OnInit()
{
#if USE_RESOURCES
// load our ressources
wxPathList pathList;
pathList.Add(_T("."));
#ifdef __WXMSW__
pathList.Add(_T("./Debug"));
pathList.Add(_T("./Release"));
#endif // wxMSW
wxString path = pathList.FindValidPath(_T("dnd.wxr"));
if ( !path )
{
wxLogError(wxT("Can't find the resource file dnd.wxr in the current ")
wxT("directory, aborting."));
return FALSE;
}
wxDefaultResourceTable->ParseResourceFile(path);
#endif
// switch on trace messages
#if defined(__WXGTK__)
wxLog::AddTraceMask(_T("clipboard"));
@@ -1496,23 +1465,11 @@ bool DnDFile::OnDropFiles(wxCoord, wxCoord, const wxArrayString& filenames)
// ----------------------------------------------------------------------------
DnDShapeDialog::DnDShapeDialog(wxFrame *parent, DnDShape *shape)
#if !USE_RESOURCES
:wxDialog( parent, 6001, wxT("Choose Shape"), wxPoint( 10, 10 ),
wxSize( 40, 40 ),
wxRAISED_BORDER|wxCAPTION|wxTHICK_FRAME|wxSYSTEM_MENU )
#endif
{
m_shape = shape;
#if USE_RESOURCES
LoadFromResource(parent, _T("dialogShape"));
m_textX = (wxTextCtrl *)wxFindWindowByName(_T("textX"), this);
m_textY = (wxTextCtrl *)wxFindWindowByName(_T("textY"), this);
m_textW = (wxTextCtrl *)wxFindWindowByName(_T("textW"), this);
m_textH = (wxTextCtrl *)wxFindWindowByName(_T("textH"), this);
m_radio = (wxRadioBox *)wxFindWindowByName(_T("radio"), this);
#else
wxBoxSizer* topSizer = new wxBoxSizer( wxVERTICAL );
// radio box
@@ -1574,7 +1531,6 @@ DnDShapeDialog::DnDShapeDialog(wxFrame *parent, DnDShape *shape)
SetAutoLayout( TRUE );
SetSizer( topSizer );
topSizer->Fit( this );
#endif
}
DnDShape *DnDShapeDialog::GetShape() const

12
samples/makefile.b32
View File

@@ -121,12 +121,8 @@ all:
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\printing
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\proplist
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\regtest
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\resource
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\rotate
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\sashtest
@@ -169,8 +165,6 @@ all:
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\tab
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\treelay
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\erase
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\event
@@ -253,12 +247,8 @@ clean:
make -f makefile.b32 clean
cd $(WXDIR)\samples\printing
make -f makefile.b32 clean
cd $(WXDIR)\samples\proplist
make -f makefile.b32 clean
cd $(WXDIR)\samples\regtest
make -f makefile.b32 clean
cd $(WXDIR)\samples\resource
make -f makefile.b32 clean
cd $(WXDIR)\samples\rotate
make -f makefile.b32 clean
cd $(WXDIR)\samples\sashtest
@@ -301,8 +291,6 @@ clean:
make -f makefile.b32 clean
cd $(WXDIR)\samples\sockets
make -f makefile.b32 clean
cd $(WXDIR)\samples\treelay
make -f makefile.b32 clean
cd $(WXDIR)\samples\treectrl
make -f makefile.b32 clean
cd $(WXDIR)\samples\tab

8
samples/makefile.dos
View File

@@ -116,14 +116,10 @@ all:
!endif
cd $(WXDIR)\samples\printing
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\proplist
nmake -f makefile.dos FINAL=$(FINAL)
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\regtest
nmake -f makefile.dos FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\resource
nmake -f makefile.dos FINAL=$(FINAL)
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\sashtest
nmake -f makefile.dos FINAL=$(FINAL)
@@ -239,14 +235,10 @@ clean:
!endif
cd $(WXDIR)\samples\printing
nmake -f makefile.dos clean
cd $(WXDIR)\samples\proplist
nmake -f makefile.dos clean
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\regtest
nmake -f makefile.dos clean
!endif
cd $(WXDIR)\samples\resource
nmake -f makefile.dos clean
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\sashtest
nmake -f makefile.dos clean

3
samples/makefile.g95
View File

@@ -63,10 +63,8 @@ all clean:
-$(MAKE) -C ownerdrw $(CMDLINE) $@
-$(MAKE) -C png $(CMDLINE) $@
-$(MAKE) -C printing $(CMDLINE) $@
-$(MAKE) -C proplist $(CMDLINE) $@
-$(MAKE) -C propsize $(CMDLINE) $@
-$(MAKE) -C regtest $(CMDLINE) $@
-$(MAKE) -C resource $(CMDLINE) $@
-$(MAKE) -C rotate $(CMDLINE) $@
-$(MAKE) -C sashtest $(CMDLINE) $@
-$(MAKE) -C scroll $(CMDLINE) $@
@@ -80,7 +78,6 @@ all clean:
-$(MAKE) -C thread $(CMDLINE) $@
-$(MAKE) -C toolbar $(CMDLINE) $@
-$(MAKE) -C treectrl $(CMDLINE) $@
-$(MAKE) -C treelay $(CMDLINE) $@
-$(MAKE) -C typetest $(CMDLINE) $@
-$(MAKE) -C validate $(CMDLINE) $@
-$(MAKE) -C widgets $(CMDLINE) $@

8
samples/makefile.vc
View File

@@ -118,12 +118,8 @@ all:
nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\printing
nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\proplist
nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\regtest
nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\resource
nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\rotate
nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\sashtest
@@ -228,12 +224,8 @@ clean:
nmake -f makefile.vc clean
cd $(WXDIR)\samples\printing
nmake -f makefile.vc clean
cd $(WXDIR)\samples\proplist
nmake -f makefile.vc clean
cd $(WXDIR)\samples\regtest
nmake -f makefile.vc clean
cd $(WXDIR)\samples\resource
nmake -f makefile.vc clean
cd $(WXDIR)\samples\rotate
nmake -f makefile.vc clean
cd $(WXDIR)\samples\sashtest

2
samples/nativdlg/nativdlg.cpp
View File

@@ -28,8 +28,6 @@
#error Sorry, this sample is only appropriate under Windows.
#endif
#include "wx/resource.h"
#include <ctype.h>
#include "nativdlg.h"
#include "resource.h"

36
samples/samples.dsw
View File

@@ -627,18 +627,6 @@ Package=<4>
###############################################################################
Project: "proplist"=.\proplist\proplist.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "propsize"=.\propsize\propsize.dsp - Package Owner=<4>
Package=<5>
@@ -663,18 +651,6 @@ Package=<4>
###############################################################################
Project: "resource"=.\resource\resource.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "rotate"=.\rotate\rotate.dsp - Package Owner=<4>
Package=<5>
@@ -831,18 +807,6 @@ Package=<4>
###############################################################################
Project: "treelay"=.\treelay\treelay.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "typetest"=.\typetest\typetest.dsp - Package Owner=<4>
Package=<5>