From 677dc0ed1a3ff68af15f6246d6d0708d5264b07a Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 14 Nov 2007 14:44:13 +0000
Subject: [PATCH] Border corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/gtk/radiobox.h   | 2 ++
 include/wx/gtk/radiobut.h   | 2 ++
 include/wx/motif/radiobox.h | 1 +
 include/wx/motif/radiobut.h | 2 ++
 include/wx/msw/radiobut.h   | 1 +
 include/wx/os2/radiobox.h   | 1 +
 include/wx/os2/radiobut.h   | 1 +
 include/wx/radiobox.h       | 2 ++
 include/wx/univ/radiobox.h  | 2 ++
 include/wx/univ/radiobut.h  | 2 ++
 10 files changed, 16 insertions(+)

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 1cfd176240..1e6bfefd0f 100644
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -142,6 +142,8 @@ public:
     wxRadioBoxButtonsInfoList   m_buttonsInfo;
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
 #if wxUSE_TOOLTIPS
     virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip);
 #endif
diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h
index bb4f5d869c..98f638b415 100644
--- a/include/wx/gtk/radiobut.h
+++ b/include/wx/gtk/radiobut.h
@@ -54,6 +54,8 @@ public:
     bool m_blockEvent;
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 9620f6f3ea..701d7729de 100644
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -113,6 +113,7 @@ public:
     virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
diff --git a/include/wx/motif/radiobut.h b/include/wx/motif/radiobut.h
index 5c06a40dea..fa2f449e62 100644
--- a/include/wx/motif/radiobut.h
+++ b/include/wx/motif/radiobut.h
@@ -48,6 +48,8 @@ public:
     // clears the selection in the radiobuttons in the cycle
     // and returns the old selection (if any)
     wxRadioButton* ClearSelections();
+protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 private:
     wxRadioButton* AddInCycle(wxRadioButton* cycle);
     void RemoveFromCycle();
diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index 5fb863eb7b..0fc9ad66a6 100644
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -54,6 +54,7 @@ public:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     virtual wxSize DoGetBestSize() const;
 
 private:
diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index fbb8c60859..04a93b0167 100644
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -165,6 +165,7 @@ public:
     wxString GetLabel(int nItem) const;
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     virtual wxSize DoGetBestSize(void) const;
     virtual void   DoSetSize( int nX
                              ,int nY
diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 34777de036..1e71293c81 100644
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -66,6 +66,7 @@ public:
     virtual void    SetFocus(void);
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     virtual wxSize DoGetBestSize() const;
 
 private:
diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 751717d3d1..de331d09dc 100644
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -96,6 +96,8 @@ protected:
 #endif // wxUSE_TOOLTIPS
     }
 
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // return the number of items in major direction (which depends on whether
     // we have wxRA_SPECIFY_COLS or wxRA_SPECIFY_ROWS style)
     unsigned int GetMajorDim() const { return m_majorDim; }
diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h
index 94830801a9..bc48405493 100644
--- a/include/wx/univ/radiobox.h
+++ b/include/wx/univ/radiobox.h
@@ -120,6 +120,8 @@ public:
     bool OnKeyDown(wxKeyEvent& event);
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // override the base class methods dealing with window positioning/sizing
     // as we must move/size the buttons as well
     virtual void DoMoveWindow(int x, int y, int width, int height);
diff --git a/include/wx/univ/radiobut.h b/include/wx/univ/radiobut.h
index 78d3bf44cb..37371d4903 100644
--- a/include/wx/univ/radiobut.h
+++ b/include/wx/univ/radiobut.h
@@ -51,6 +51,8 @@ public:
     virtual void ChangeValue(bool value);
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // implement our own drawing
     virtual void DoDraw(wxControlRenderer *renderer);
 
-- 
2.47.2