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

initialize base class using its ctor

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-16 04:35:22 +00:00
parent 1003169e21
commit f37c35d717
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mac/carbon/display.cpp
View File

@@ -55,7 +55,11 @@
class wxDisplayImplMacOSX : public wxDisplayImpl
{
public:
wxDisplayImplMacOSX(CGDirectDisplayID id) : m_id(id) { }
wxDisplayImplMacOSX(size_t n, CGDirectDisplayID id)
: wxDisplayImpl(n),
m_id(id)
{
}
virtual wxRect GetGeometry() const;
virtual wxString GetName() const { return wxString(); }
@@ -148,7 +152,7 @@ wxDisplayImpl *wxDisplayFactoryMacOSX::CreateDisplay(size_t n)
wxASSERT( err == CGDisplayNoErr );
wxASSERT( n < theCount );
wxDisplayImplMacOSX *display = new wxDisplayImplMacOSX(theIDs[n]);
wxDisplayImplMacOSX *display = new wxDisplayImplMacOSX(n, theIDs[n]);
delete [] theIDs;
@@ -251,7 +255,11 @@ bool wxDisplayImplMacOSX::ChangeMode( const wxVideoMode& mode )
class wxDisplayImplMac : public wxDisplayImpl
{
public:
wxDisplayImplMac(GDHandle hndl) : m_hndl(hndl) { }
wxDisplayImplMac(size_t n, GDHandle hndl)
: wxDisplayImpl(n),
m_hndl(hndl)
{
}
virtual wxRect GetGeometry() const;
virtual wxString GetName() const { return wxString(); }
@@ -318,12 +326,14 @@ int wxDisplayFactoryMac::GetFromPoint(const wxPoint &p)
wxDisplayImpl *wxDisplayFactoryMac::CreateDisplay(size_t n)
{
size_t nOrig = n;
GDHandle hndl = DMGetFirstScreenDevice(true);
while(hndl)
{
if (n == 0)
{
return new wxDisplayImplMac(hndl);
return new wxDisplayImplMac(nOrig, hndl);
}
n--;
hndl = DMGetNextScreenDevice(hndl, true);

10
src/mac/classic/display.cpp
View File

@@ -53,7 +53,11 @@
class wxDisplayImplMac : public wxDisplayImpl
{
public:
wxDisplayImplMac(GDHandle hndl) : m_hndl(hndl) { }
wxDisplayImplMac(size_t n, GDHandle hndl)
: wxDisplayImpl(n),
m_hndl(hndl)
{
}
virtual wxRect GetGeometry() const;
virtual wxString GetName() const { return wxString(); }
@@ -120,12 +124,14 @@ int wxDisplayFactoryMac::GetFromPoint(const wxPoint &p)
wxDisplayImpl *wxDisplayFactoryMac::CreateDisplay(size_t n)
{
size_t nOrig = n;
GDHandle hndl = DMGetFirstScreenDevice(true);
while(hndl)
{
if (n == 0)
{
return new wxDisplayImplMac(hndl);
return new wxDisplayImplMac(nOrig, hndl);
}
n--;
hndl = DMGetNextScreenDevice(hndl, true);