Default border for a static box is wxBORDER_NONE

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 0922fe12eed42c10955b6d6ef641ed379dd40b3f..e3714e0a3691163009e0fc672c72cc59b1e8881d 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -45,6 +45,9 @@ public:
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const;
+

     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index deb7761c269ec8e67c6caa86e4caad81a3500594..6ecb72dff2abe47903214f21f788776d126833ec 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -121,11 +121,18 @@ bool wxStaticBox::Create(wxWindow *parent,
     if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
         return false;
 
     if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
         return false;
 

+#ifndef __WXWINCE__

     Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint));
     Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint));

+#endif

 
     return true;
 }
 
 
     return true;
 }
 

+wxBorder wxStaticBox::GetDefaultBorder() const
+{
+    return wxBORDER_NONE;
+}
+

 WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);
 WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);