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

Remove the test for parent window type when checking if to give a

Browse Source 
sunken style automatically


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-06-16 22:08:01 +00:00
parent be235d0801
commit 577baeef5a
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/msw/window.cpp
View File

@@ -183,7 +183,7 @@ extern "C" LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT messag
LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam); WPARAM wParam, LPARAM lParam);
#endif #endif
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
const char *wxGetMessageName(int message); const char *wxGetMessageName(int message);
@@ -1035,25 +1035,24 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
style |= WS_HSCROLL; style |= WS_HSCROLL;
wxBorder border = (wxBorder)(flags & wxBORDER_MASK); wxBorder border = (wxBorder)(flags & wxBORDER_MASK);
// Check if we want to automatically give it a sunken style. // Check if we want to automatically give it a sunken style.
// Note than because 'sunken' actually maps to WS_EX_CLIENTEDGE, which // Note than because 'sunken' actually maps to WS_EX_CLIENTEDGE, which
// is a more neutral term, we don't necessarily get a sunken effect in // is a more neutral term, we don't necessarily get a sunken effect in
// Windows XP. Instead we get the appropriate style for the theme. // Windows XP. Instead we get the appropriate style for the theme.
if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() && if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() &&
IsKindOf(CLASSINFO(wxControl)) && IsKindOf(CLASSINFO(wxControl)) &&
GetParent() && (GetParent()->IsKindOf(CLASSINFO(wxPanel)) || GetParent() &&
GetParent()->IsKindOf(CLASSINFO(wxDialog))) &&
((GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS)) ((GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
{ {
border = (wxBorder)((flags & wxBORDER_MASK) | wxBORDER_SUNKEN); border = (wxBorder)((flags & wxBORDER_MASK) | wxBORDER_SUNKEN);
} }
// Only give it WS_BORDER for wxBORDER_SIMPLE // Only give it WS_BORDER for wxBORDER_SIMPLE
if (border & wxBORDER_SIMPLE) if (border & wxBORDER_SIMPLE)
style |= WS_BORDER; style |= WS_BORDER;
// now deal with ext style if the caller wants it // now deal with ext style if the caller wants it
if ( exstyle ) if ( exstyle )
{ {
@@ -3270,7 +3269,7 @@ bool wxWindowMSW::HandleInitDialog(WXHWND WXUNUSED(hWndFocus))
bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam) bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam)
{ {
#if defined (__WXMICROWIN__) #if defined (__WXMICROWIN__)
return FALSE; return FALSE;
#else // __WXMICROWIN__ #else // __WXMICROWIN__
HDROP hFilesInfo = (HDROP) wParam; HDROP hFilesInfo = (HDROP) wParam;
@@ -3746,7 +3745,7 @@ bool wxWindowMSW::HandlePaint()
{ {
// if (GetExtraStyle() & wxWS_EX_THEMED_BACKGROUND) // if (GetExtraStyle() & wxWS_EX_THEMED_BACKGROUND)
// return FALSE; // return FALSE;
#ifdef __WIN32__ #ifdef __WIN32__
HRGN hRegion = ::CreateRectRgn(0, 0, 0, 0); // Dummy call to get a handle HRGN hRegion = ::CreateRectRgn(0, 0, 0, 0); // Dummy call to get a handle
if ( !hRegion ) if ( !hRegion )
@@ -3821,7 +3820,7 @@ bool wxWindowMSW::HandleEraseBkgnd(WXHDC hdc)
} }
} }
#endif #endif
wxDCTemp dc(hdc); wxDCTemp dc(hdc);
dc.SetHDC(hdc); dc.SetHDC(hdc);
@@ -3893,7 +3892,7 @@ bool wxWindowMSW::HandleMoving(wxRect& rect)
{ {
wxMoveEvent event(rect, m_windowId); wxMoveEvent event(rect, m_windowId);
event.SetEventObject(this); event.SetEventObject(this);
bool rc = GetEventHandler()->ProcessEvent(event); bool rc = GetEventHandler()->ProcessEvent(event);
if (rc) if (rc)
rect = event.GetRect(); rect = event.GetRect();
@@ -3916,7 +3915,7 @@ bool wxWindowMSW::HandleSizing(wxRect& rect)
{ {
wxSizeEvent event(rect, m_windowId); wxSizeEvent event(rect, m_windowId);
event.SetEventObject(this); event.SetEventObject(this);
bool rc = GetEventHandler()->ProcessEvent(event); bool rc = GetEventHandler()->ProcessEvent(event);
if (rc) if (rc)
rect = event.GetRect(); rect = event.GetRect();