linking fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 752fd0946249c9e5cc6415c795699625c7381efe..e23af8e1cd4a9e24142c89708c93cbe385a3980d 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -35,7 +35,7 @@ public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 

-    ~wxWindowDC();
+    virtual ~wxWindowDC();

 
     virtual bool CanDrawBitmap() const { return TRUE; }
     virtual bool CanGetTextExtent() const { return TRUE; }
 
     virtual bool CanDrawBitmap() const { return TRUE; }
     virtual bool CanGetTextExtent() const { return TRUE; }


@@ -140,7 +140,7 @@ private:
 class wxClientDC : public wxWindowDC
 {
 public:
 class wxClientDC : public wxWindowDC
 {
 public:

-    wxClientDC();
+    wxClientDC() { }

     wxClientDC( wxWindow *win );
 
 protected:
     wxClientDC( wxWindow *win );
 
 protected:

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index 752fd0946249c9e5cc6415c795699625c7381efe..e23af8e1cd4a9e24142c89708c93cbe385a3980d 100644 (file)
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -35,7 +35,7 @@ public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 

-    ~wxWindowDC();
+    virtual ~wxWindowDC();

 
     virtual bool CanDrawBitmap() const { return TRUE; }
     virtual bool CanGetTextExtent() const { return TRUE; }
 
     virtual bool CanDrawBitmap() const { return TRUE; }
     virtual bool CanGetTextExtent() const { return TRUE; }


@@ -140,7 +140,7 @@ private:
 class wxClientDC : public wxWindowDC
 {
 public:
 class wxClientDC : public wxWindowDC
 {
 public:

-    wxClientDC();
+    wxClientDC() { }

     wxClientDC( wxWindow *win );
 
 protected:
     wxClientDC( wxWindow *win );
 
 protected:

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 0d0376f8e02e8ba9930318f5ec959bfc8406a15e..8a507fb23addc90696283a0a75cd8edf17801511 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -2102,6 +2102,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 wxClientDC::wxClientDC( wxWindow *win )
           : wxWindowDC( win )
 {
 wxClientDC::wxClientDC( wxWindow *win )
           : wxWindowDC( win )
 {

+    wxCHECK_RET( win, _T("NULL window in wxClientDC::wxClientDC") );
+

 #ifdef __WXUNIVERSAL__
     wxPoint ptOrigin = win->GetClientAreaOrigin();
     SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
 #ifdef __WXUNIVERSAL__
     wxPoint ptOrigin = win->GetClientAreaOrigin();
     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
 // ----------------------------------------------------------------------------

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 0d0376f8e02e8ba9930318f5ec959bfc8406a15e..8a507fb23addc90696283a0a75cd8edf17801511 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -2102,6 +2102,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 wxClientDC::wxClientDC( wxWindow *win )
           : wxWindowDC( win )
 {
 wxClientDC::wxClientDC( wxWindow *win )
           : wxWindowDC( win )
 {

+    wxCHECK_RET( win, _T("NULL window in wxClientDC::wxClientDC") );
+

 #ifdef __WXUNIVERSAL__
     wxPoint ptOrigin = win->GetClientAreaOrigin();
     SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
 #ifdef __WXUNIVERSAL__
     wxPoint ptOrigin = win->GetClientAreaOrigin();
     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
 // ----------------------------------------------------------------------------