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

linking fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-27 12:17:39 +00:00
parent b90c32b486
commit 4f55a07f9f
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/dcclient.h
View File

@@ -35,7 +35,7 @@ public:
wxWindowDC(); wxWindowDC();
wxWindowDC( wxWindow *win ); wxWindowDC( wxWindow *win );
~wxWindowDC(); virtual ~wxWindowDC();
virtual bool CanDrawBitmap() const { return TRUE; } virtual bool CanDrawBitmap() const { return TRUE; }
virtual bool CanGetTextExtent() const { return TRUE; } virtual bool CanGetTextExtent() const { return TRUE; }
@@ -140,7 +140,7 @@ private:
class wxClientDC : public wxWindowDC class wxClientDC : public wxWindowDC
{ {
public: public:
wxClientDC(); wxClientDC() { }
wxClientDC( wxWindow *win ); wxClientDC( wxWindow *win );
protected: protected:

4
include/wx/gtk1/dcclient.h
View File

@@ -35,7 +35,7 @@ public:
wxWindowDC(); wxWindowDC();
wxWindowDC( wxWindow *win ); wxWindowDC( wxWindow *win );
~wxWindowDC(); virtual ~wxWindowDC();
virtual bool CanDrawBitmap() const { return TRUE; } virtual bool CanDrawBitmap() const { return TRUE; }
virtual bool CanGetTextExtent() const { return TRUE; } virtual bool CanGetTextExtent() const { return TRUE; }
@@ -140,7 +140,7 @@ private:
class wxClientDC : public wxWindowDC class wxClientDC : public wxWindowDC
{ {
public: public:
wxClientDC(); wxClientDC() { }
wxClientDC( wxWindow *win ); wxClientDC( wxWindow *win );
protected: protected:

9
src/gtk/dcclient.cpp
View File

@@ -2102,6 +2102,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
wxClientDC::wxClientDC( wxWindow *win ) wxClientDC::wxClientDC( wxWindow *win )
: wxWindowDC( win ) : wxWindowDC( win )
{ {
wxCHECK_RET( win, _T("NULL window in wxClientDC::wxClientDC") );
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
wxPoint ptOrigin = win->GetClientAreaOrigin(); wxPoint ptOrigin = win->GetClientAreaOrigin();
SetDeviceOrigin(ptOrigin.x, ptOrigin.y); SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
@@ -2110,6 +2112,13 @@ wxClientDC::wxClientDC( wxWindow *win )
#endif // __WXUNIVERSAL__ #endif // __WXUNIVERSAL__
} }
void wxClientDC::DoGetSize(int *width, int *height) const
{
wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );
m_owner->GetClientSize( width, height );
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxDCModule // wxDCModule
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

9
src/gtk1/dcclient.cpp
View File

@@ -2102,6 +2102,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
wxClientDC::wxClientDC( wxWindow *win ) wxClientDC::wxClientDC( wxWindow *win )
: wxWindowDC( win ) : wxWindowDC( win )
{ {
wxCHECK_RET( win, _T("NULL window in wxClientDC::wxClientDC") );
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
wxPoint ptOrigin = win->GetClientAreaOrigin(); wxPoint ptOrigin = win->GetClientAreaOrigin();
SetDeviceOrigin(ptOrigin.x, ptOrigin.y); SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
@@ -2110,6 +2112,13 @@ wxClientDC::wxClientDC( wxWindow *win )
#endif // __WXUNIVERSAL__ #endif // __WXUNIVERSAL__
} }
void wxClientDC::DoGetSize(int *width, int *height) const
{
wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );
m_owner->GetClientSize( width, height );
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxDCModule // wxDCModule
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------