Border corrections

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 1cfd1762407659a43c366a051c37c1691087f5af..1e6bfefd0fca33a4b845c5b9b0175e9eb744126c 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -142,6 +142,8 @@ public:
     wxRadioBoxButtonsInfoList   m_buttonsInfo;
 
 protected:
     wxRadioBoxButtonsInfoList   m_buttonsInfo;
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

 #if wxUSE_TOOLTIPS
     virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip);
 #endif
 #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 bb4f5d869cffc81d7a73392dc00fd31e7ced7a92..98f638b415822610cb3fc438423ea6cea3329ed1 100644 (file)
--- a/include/wx/gtk/radiobut.h
+++ b/include/wx/gtk/radiobut.h
@@ -54,6 +54,8 @@ public:
     bool m_blockEvent;
 
 protected:
     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;
     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 9620f6f3eaae295452904e6ebf4690665dae47d0..701d7729defede9aafd95565895fc6c5158c0a2b 100644 (file)
--- 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 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);
     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 5c06a40deab0c54949f7535502b11ad29413d10f..fa2f449e6229b87c57615d0d642aa7417d49c651 100644 (file)
--- 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();
     // 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();
 private:
     wxRadioButton* AddInCycle(wxRadioButton* cycle);
     void RemoveFromCycle();

diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index 5fb863eb7b97486165c8be88b09030ea13c9137f..0fc9ad66a6b29fea0abb47dc131b820f1b7dcc03 100644 (file)
--- 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 WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

     virtual wxSize DoGetBestSize() const;
 
 private:
     virtual wxSize DoGetBestSize() const;
 
 private:

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index fbb8c6085914b469add061cabf6c2545c245aa95..04a93b01678f485b78bebea8e73a1c5f3afa9a0e 100644 (file)
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -165,6 +165,7 @@ public:
     wxString GetLabel(int nItem) const;
 
 protected:
     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
     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 34777de036d9154c846b42f8f86b178e8aa35468..1e71293c8114b375a2f970934fca572a4d5bbb2a 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -66,6 +66,7 @@ public:
     virtual void    SetFocus(void);
 
 protected:
     virtual void    SetFocus(void);
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

     virtual wxSize DoGetBestSize() const;
 
 private:
     virtual wxSize DoGetBestSize() const;
 
 private:

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 751717d3d16b700132fa727043a523f9fa996d97..de331d09dc3b5da0e7cb772e2b5b6adbd716c190 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -96,6 +96,8 @@ protected:
 #endif // wxUSE_TOOLTIPS
     }
 
 #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; }
     // 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 94830801a9fa16870f7c18192753f802a83e862e..bc48405493f121b914cc53d9064d43fdce99c8d6 100644 (file)
--- a/include/wx/univ/radiobox.h
+++ b/include/wx/univ/radiobox.h
@@ -120,6 +120,8 @@ public:
     bool OnKeyDown(wxKeyEvent& event);
 
 protected:
     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);
     // 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 78d3bf44cb22e881a17b98157c6cbdae15ae6941..37371d4903435086fd0b2d47577d3ac92ad8cca7 100644 (file)
--- a/include/wx/univ/radiobut.h
+++ b/include/wx/univ/radiobut.h
@@ -51,6 +51,8 @@ public:
     virtual void ChangeValue(bool value);
 
 protected:
     virtual void ChangeValue(bool value);
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // implement our own drawing
     virtual void DoDraw(wxControlRenderer *renderer);
 
     // implement our own drawing
     virtual void DoDraw(wxControlRenderer *renderer);