From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 14 Nov 2007 14:51:00 +0000 (+0000)
Subject: Conflict correction
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6aff27c9f17300af3f9272f9ebe43a6aae2807d3

Conflict correction


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

diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index 0fc9ad66a6..e5959d494b 100644
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -49,7 +49,6 @@ public:
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual void Command(wxCommandEvent& event);
     virtual bool HasTransparentBackground() { return true; }
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;