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

moved styles logic to MSWGetStyle() (no real changes)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-01-15 17:10:34 +00:00
parent 32f1f66a3e
commit e31e6ea75d
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,8 +9,8 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_STATBOX_H_ #ifndef _WX_MSW_STATBOX_H_
#define _WX_STATBOX_H_ #define _WX_MSW_STATBOX_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "statbox.h" #pragma interface "statbox.h"
@@ -42,11 +42,12 @@ public:
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC); virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC);
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox) DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
}; };
#endif #endif // _WX_MSW_STATBOX_H_
// _WX_STATBOX_H_

16
src/msw/statbox.cpp
View File

@@ -40,7 +40,8 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
// this is for Win CE // under CE this style is not defined but we don't need to make static boxes
// transparent there neither
#ifndef WS_EX_TRANSPARENT #ifndef WS_EX_TRANSPARENT
#define WS_EX_TRANSPARENT 0 #define WS_EX_TRANSPARENT 0
#endif #endif
@@ -120,13 +121,22 @@ bool wxStaticBox::Create(wxWindow *parent,
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
return false; return false;
if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label, if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
WS_EX_TRANSPARENT) )
return false; return false;
return true; return true;
} }
WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
{
long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);
if ( exstyle )
*exstyle = WS_EX_TRANSPARENT;
return styleWin | BS_GROUPBOX;
}
wxSize wxStaticBox::DoGetBestSize() const wxSize wxStaticBox::DoGetBestSize() const
{ {
int cx, cy; int cx, cy;