reverted Julian's unintentional breakage of wxChoice

[wxWidgets.git] / include / wx / dc.h

diff --git a/include/wx/dc.h b/include/wx/dc.h
index ccf87a178494b536de213e4f404d9e4b69d75c33..8366a5c4794aeb3e202777b2c6a6e9bb666de543 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -28,7 +28,6 @@
 #include "wx/brush.h"
 #include "wx/pen.h"
 #include "wx/palette.h"
-
 #include "wx/list.h"            // we use wxList in inline functions
 
 class WXDLLEXPORT wxDCBase;
@@ -227,6 +226,9 @@ public:
 
     void DrawCircle(wxCoord x, wxCoord y, wxCoord radius)
         { DoDrawEllipse(x - radius, y - radius, 2*radius, 2*radius); }
+    void DrawCircle(const wxPoint& pt, wxCoord radius)
+        { DrawCircle(pt.x, pt.y, radius); }
+
     void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
         { DoDrawEllipse(x, y, width, height); }
     void DrawEllipse(const wxPoint& pt, const wxSize& sz)
@@ -741,6 +743,7 @@ protected:
 
 #if wxUSE_PALETTE
     wxPalette         m_palette;
+    bool              m_hasCustomPalette;
 #endif // wxUSE_PALETTE
 
 private:
@@ -758,6 +761,8 @@ private:
     #include "wx/motif/dc.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dc.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/dc.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/dc.h"
 #elif defined(__WXMAC__)