Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix top margin for static box sizer when wxDIALOG_UNIT_COMPATIBILITY == 0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-07 23:41:07 +00:00
parent 5dd070c25b
commit 58385af016
2 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/msw/statbox.h
View File

@@ -39,13 +39,14 @@ public:
long style = 0, long style = 0,
const wxString& name = wxStaticBoxNameStr); const wxString& name = wxStaticBoxNameStr);
/// Implementation /// Implementation only
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox) DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)

49
src/msw/statbox.cpp
View File

@@ -155,35 +155,44 @@ wxSize wxStaticBox::DoGetBestSize() const
WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{ {
#ifndef __WXWINCE__ #ifndef __WXWINCE__
switch ( nMsg ) if ( nMsg == WM_NCHITTEST )
{ {
case WM_NCHITTEST: // This code breaks some other processing such as enter/leave tracking
{ // so it's off by default.
// This code breaks some other processing such as enter/leave tracking
// so it's off by default.
static int s_useHTClient = -1; static int s_useHTClient = -1;
if (s_useHTClient == -1) if (s_useHTClient == -1)
s_useHTClient = wxSystemOptions::GetOptionInt(wxT("msw.staticbox.htclient")); s_useHTClient = wxSystemOptions::GetOptionInt(wxT("msw.staticbox.htclient"));
if (s_useHTClient == 1) if (s_useHTClient == 1)
{ {
int xPos = LOWORD(lParam); // horizontal position of cursor int xPos = LOWORD(lParam); // horizontal position of cursor
int yPos = HIWORD(lParam); // vertical position of cursor int yPos = HIWORD(lParam); // vertical position of cursor
ScreenToClient(&xPos, &yPos); ScreenToClient(&xPos, &yPos);
// Make sure you can drag by the top of the groupbox, but let // Make sure you can drag by the top of the groupbox, but let
// other (enclosed) controls get mouse events also // other (enclosed) controls get mouse events also
if ( yPos < 10 ) if ( yPos < 10 )
return (long)HTCLIENT; return (long)HTCLIENT;
} }
}
break;
} }
#endif // !__WXWINCE__ #endif // !__WXWINCE__
return wxControl::MSWWindowProc(nMsg, wParam, lParam); return wxControl::MSWWindowProc(nMsg, wParam, lParam);
} }
void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
{
wxStaticBoxBase::GetBordersForSizer(borderTop, borderOther);
// if not using correct (but backwards cojmpatible) text metrics
// calculations, we need to add some extra margin or otherwise static box
// title is clipped
#if !wxDIALOG_UNIT_COMPATIBILITY
if ( !GetLabel().empty() )
*borderTop += GetCharHeight()/3;
#endif // !wxDIALOG_UNIT_COMPATIBILITY
}
#endif // wxUSE_STATBOX #endif // wxUSE_STATBOX