define wxUSE_BOOKCTRL when wxUSE_NOTE/LIST/CHOICEBOOK are 0; also define it as as...

[wxWidgets.git] / include / wx / motif / dcclient.h

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index 6d088a05c63cce9d3f4fc57059430337abfdc0bf..2208d7c829a0b36125551fc219002c919ed281b8 100644 (file)
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcclient.h
+// Name:        wx/motif/dcclient.h
 // Purpose:     wxClientDC, wxPaintDC and wxWindowDC classes
 // Author:      Julian Smart
 // Modified by:
@@ -36,7 +36,7 @@ public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 
-    ~wxWindowDC();
+    virtual ~wxWindowDC();
 
     // TODO this function is Motif-only for now - should it go into base class?
     void Clear(const wxRect& rect);
@@ -82,7 +82,7 @@ public:
     WXGC GetGC() const { return m_gc; }
     WXGC GetBackingGC() const { return m_gcBacking; }
     WXDisplay* GetDisplay() const { return m_display; }
-    bool GetAutoSetting() const { return m_autoSetting; }
+    bool GetAutoSetting() const { return (m_autoSetting != 0); } // See comment in dcclient.cpp
     void SetAutoSetting(bool flag) { m_autoSetting = flag; }
 
 protected:
@@ -174,7 +174,7 @@ public:
     wxPaintDC() { }
     wxPaintDC(wxWindow* win);
 
-    ~wxPaintDC();
+    virtual ~wxPaintDC();
 };
 
 class WXDLLEXPORT wxClientDC: public wxWindowDC
@@ -187,4 +187,3 @@ public:
 };
 
 #endif // _WX_DCCLIENT_H_
-