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 0fc9ad66a6b29fea0abb47dc131b820f1b7dcc03..e5959d494b7579e40b2862fe7d4450537f6d8d1c 100644 (file)
--- 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 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;
 
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;