Small Tex2RTF fixes; wxMotif compile fixes (motif.inc, wxCheckListBox);
wxMSW wxWindow::IsShown fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -770,13 +770,14 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
|
||||
|
||||
bool wxWindow::Show(bool show)
|
||||
{
|
||||
m_isShown = show;
|
||||
HWND hWnd = (HWND) GetHWND();
|
||||
int cshow;
|
||||
if (show)
|
||||
cshow = SW_SHOW;
|
||||
else
|
||||
cshow = SW_HIDE;
|
||||
ShowWindow(hWnd, (BOOL)cshow);
|
||||
ShowWindow(hWnd, cshow);
|
||||
if (show)
|
||||
{
|
||||
BringWindowToTop(hWnd);
|
||||
@@ -788,7 +789,11 @@ bool wxWindow::Show(bool show)
|
||||
|
||||
bool wxWindow::IsShown(void) const
|
||||
{
|
||||
return (::IsWindowVisible((HWND) GetHWND()) != 0);
|
||||
// Can't rely on IsWindowVisible, since it will return FALSE
|
||||
// if the parent is not visible.
|
||||
return m_isShown;
|
||||
// int ret = ::IsWindowVisible((HWND) GetHWND()) ;
|
||||
// return (ret != 0);
|
||||
}
|
||||
|
||||
int wxWindow::GetCharHeight(void) const
|
||||
|
Reference in New Issue
Block a user