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

Update list operators, s/TRUE/true/ etc.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2003-01-25 04:35:21 +00:00
parent a0f3867a6a
commit 4f8090e092
2 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/msw/gdiimage.cpp
View File

@@ -110,14 +110,14 @@ public:
int WXUNUSED(height), int WXUNUSED(height),
int WXUNUSED(depth) = 1) int WXUNUSED(depth) = 1)
{ {
return FALSE; return false;
} }
virtual bool Save(wxGDIImage *WXUNUSED(image), virtual bool Save(wxGDIImage *WXUNUSED(image),
const wxString& WXUNUSED(name), const wxString& WXUNUSED(name),
int WXUNUSED(type)) int WXUNUSED(type))
{ {
return FALSE; return false;
} }
virtual bool Load(wxGDIImage *image, virtual bool Load(wxGDIImage *image,
@@ -126,7 +126,7 @@ public:
int desiredWidth, int desiredHeight) int desiredWidth, int desiredHeight)
{ {
wxIcon *icon = wxDynamicCast(image, wxIcon); wxIcon *icon = wxDynamicCast(image, wxIcon);
wxCHECK_MSG( icon, FALSE, _T("wxIconHandler only works with icons") ); wxCHECK_MSG( icon, false, _T("wxIconHandler only works with icons") );
return LoadIcon(icon, name, flags, desiredWidth, desiredHeight); return LoadIcon(icon, name, flags, desiredWidth, desiredHeight);
} }
@@ -205,7 +205,7 @@ bool wxGDIImage::FreeResource(bool WXUNUSED(force))
GetGDIImageData()->m_handle = 0; GetGDIImageData()->m_handle = 0;
} }
return TRUE; return true;
} }
WXHANDLE wxGDIImage::GetResourceHandle() const WXHANDLE wxGDIImage::GetResourceHandle() const
@@ -233,21 +233,21 @@ bool wxGDIImage::RemoveHandler(const wxString& name)
if ( handler ) if ( handler )
{ {
ms_handlers.DeleteObject(handler); ms_handlers.DeleteObject(handler);
return TRUE; return true;
} }
else else
return FALSE; return false;
} }
wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name) wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
{ {
wxNode *node = ms_handlers.First(); wxNode *node = ms_handlers.GetFirst();
while ( node ) while ( node )
{ {
wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data(); wxGDIImageHandler *handler = (wxGDIImageHandler *)node->GetData();
if ( handler->GetName() == name ) if ( handler->GetName() == name )
return handler; return handler;
node = node->Next(); node = node->GetNext();
} }
return NULL; return NULL;
@@ -256,31 +256,31 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension, wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
long type) long type)
{ {
wxNode *node = ms_handlers.First(); wxNode *node = ms_handlers.GetFirst();
while ( node ) while ( node )
{ {
wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data(); wxGDIImageHandler *handler = (wxGDIImageHandler *)node->GetData();
if ( (handler->GetExtension() = extension) && if ( (handler->GetExtension() = extension) &&
(type == -1 || handler->GetType() == type) ) (type == -1 || handler->GetType() == type) )
{ {
return handler; return handler;
} }
node = node->Next(); node = node->GetNext();
} }
return NULL; return NULL;
} }
wxGDIImageHandler *wxGDIImage::FindHandler(long type) wxGDIImageHandler *wxGDIImage::FindHandler(long type)
{ {
wxNode *node = ms_handlers.First(); wxNode *node = ms_handlers.GetFirst();
while ( node ) while ( node )
{ {
wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data(); wxGDIImageHandler *handler = (wxGDIImageHandler *)node->GetData();
if ( handler->GetType() == type ) if ( handler->GetType() == type )
return handler; return handler;
node = node->Next(); node = node->GetNext();
} }
return NULL; return NULL;
@@ -288,11 +288,11 @@ wxGDIImageHandler *wxGDIImage::FindHandler(long type)
void wxGDIImage::CleanUpHandlers() void wxGDIImage::CleanUpHandlers()
{ {
wxNode *node = ms_handlers.First(); wxNode *node = ms_handlers.GetFirst();
while ( node ) while ( node )
{ {
wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data(); wxGDIImageHandler *handler = (wxGDIImageHandler *)node->GetData();
wxNode *next = node->Next(); wxNode *next = node->GetNext();
delete handler; delete handler;
delete node; delete node;
node = next; node = next;
@@ -329,7 +329,7 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."), wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."),
name.c_str()); name.c_str());
return FALSE; return false;
} }
BITMAP bm; BITMAP bm;
@@ -342,7 +342,7 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
bitmap->SetHeight(bm.bmHeight); bitmap->SetHeight(bm.bmHeight);
bitmap->SetDepth(bm.bmBitsPixel); bitmap->SetDepth(bm.bmBitsPixel);
return TRUE; return true;
} }
bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
@@ -366,7 +366,7 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
return success; return success;
#else #else
return FALSE; return false;
#endif #endif
} }
@@ -387,7 +387,7 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
return wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0; return wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0;
#else #else
return FALSE; return false;
#endif #endif
} }
@@ -482,7 +482,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
wxLogSysError(_T("Failed to load icon from the file '%s'"), wxLogSysError(_T("Failed to load icon from the file '%s'"),
name.c_str()); name.c_str());
return FALSE; return false;
} }
size = wxGetHiconSize(hicon); size = wxGetHiconSize(hicon);
@@ -496,13 +496,13 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
(desiredHeight != -1 && desiredHeight != size.y) ) (desiredHeight != -1 && desiredHeight != size.y) )
{ {
wxLogTrace(_T("iconload"), wxLogTrace(_T("iconload"),
_T("Returning FALSE from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"), _T("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"),
size.x, size.y, size.x, size.y,
desiredWidth, desiredHeight); desiredWidth, desiredHeight);
::DestroyIcon(hicon); ::DestroyIcon(hicon);
return FALSE; return false;
} }
icon->SetHICON((WXHICON)hicon); icon->SetHICON((WXHICON)hicon);
@@ -510,7 +510,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
return icon->Ok(); return icon->Ok();
#else #else
return FALSE; return false;
#endif #endif
} }

104
src/msw/mdi.cpp
View File

@@ -161,7 +161,7 @@ wxMDIParentFrame::wxMDIParentFrame()
m_clientWindow = NULL; m_clientWindow = NULL;
m_currentChild = NULL; m_currentChild = NULL;
m_windowMenu = (wxMenu*) NULL; m_windowMenu = (wxMenu*) NULL;
m_parentFrameActive = TRUE; m_parentFrameActive = true;
} }
bool wxMDIParentFrame::Create(wxWindow *parent, bool wxMDIParentFrame::Create(wxWindow *parent,
@@ -194,7 +194,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
m_windowMenu->Append(IDM_WINDOWPREV, _("&Previous")); m_windowMenu->Append(IDM_WINDOWPREV, _("&Previous"));
} }
m_parentFrameActive = TRUE; m_parentFrameActive = true;
if (!parent) if (!parent)
wxTopLevelWindows.Append(this); wxTopLevelWindows.Append(this);
@@ -219,15 +219,15 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
msflags, msflags,
exflags) ) exflags) )
{ {
return FALSE; return false;
} }
wxModelessWindows.Append(this); wxModelessWindows.Append(this);
// unlike (almost?) all other windows, frames are created hidden // unlike (almost?) all other windows, frames are created hidden
m_isShown = FALSE; m_isShown = false;
return TRUE; return true;
} }
wxMDIParentFrame::~wxMDIParentFrame() wxMDIParentFrame::~wxMDIParentFrame()
@@ -266,7 +266,7 @@ wxMDIParentFrame::~wxMDIParentFrame()
void wxMDIParentFrame::InternalSetMenuBar() void wxMDIParentFrame::InternalSetMenuBar()
{ {
m_parentFrameActive = TRUE; m_parentFrameActive = true;
InsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this)); InsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this));
} }
@@ -384,7 +384,7 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message,
WXLPARAM lParam) WXLPARAM lParam)
{ {
long rc = 0; long rc = 0;
bool processed = FALSE; bool processed = false;
switch ( message ) switch ( message )
{ {
@@ -409,7 +409,7 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message,
// even if the frame didn't process it, there is no need to try it // even if the frame didn't process it, there is no need to try it
// once again (i.e. call wxFrame::HandleCommand()) - we just dud it, // once again (i.e. call wxFrame::HandleCommand()) - we just dud it,
// so pretend we processed the message anyhow // so pretend we processed the message anyhow
processed = TRUE; processed = true;
} }
// always pass this message DefFrameProc(), otherwise MDI menu // always pass this message DefFrameProc(), otherwise MDI menu
@@ -427,14 +427,14 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message,
rc = -1; rc = -1;
} }
processed = TRUE; processed = true;
break; break;
case WM_ERASEBKGND: case WM_ERASEBKGND:
processed = TRUE; processed = true;
// we erase background ourselves // we erase background ourselves
rc = TRUE; rc = true;
break; break;
case WM_MENUSELECT: case WM_MENUSELECT:
@@ -470,12 +470,12 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message,
bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate) bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate)
{ {
bool processed = FALSE; bool processed = false;
if ( wxWindow::HandleActivate(state, minimized, activate) ) if ( wxWindow::HandleActivate(state, minimized, activate) )
{ {
// already processed // already processed
processed = TRUE; processed = true;
} }
// If this window is an MDI parent, we must also send an OnActivate message // If this window is an MDI parent, we must also send an OnActivate message
@@ -483,10 +483,10 @@ bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate
if ( (m_currentChild != NULL) && if ( (m_currentChild != NULL) &&
((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)) ) ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)) )
{ {
wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_currentChild->GetId()); wxActivateEvent event(wxEVT_ACTIVATE, true, m_currentChild->GetId());
event.SetEventObject( m_currentChild ); event.SetEventObject( m_currentChild );
if ( m_currentChild->GetEventHandler()->ProcessEvent(event) ) if ( m_currentChild->GetEventHandler()->ProcessEvent(event) )
processed = TRUE; processed = true;
} }
return processed; return processed;
@@ -546,13 +546,13 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
{ {
::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam); ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam);
return TRUE; return true;
} }
// FIXME VZ: what does this test do?? // FIXME VZ: what does this test do??
if (id >= 0xF000) if (id >= 0xF000)
{ {
return FALSE; // Get WndProc to call default proc return false; // Get WndProc to call default proc
} }
if ( IsMdiCommandId(id) ) if ( IsMdiCommandId(id) )
@@ -569,7 +569,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
::SendMessage( GetWinHwnd(GetClientWindow()), ::SendMessage( GetWinHwnd(GetClientWindow()),
WM_MDIACTIVATE, WM_MDIACTIVATE,
(WPARAM)child->GetHWND(), 0); (WPARAM)child->GetHWND(), 0);
return TRUE; return true;
} }
} }
node = node->GetNext(); node = node->GetNext();
@@ -590,7 +590,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
wxFAIL_MSG(wxT("MDI parent frame is not active, yet there is no active MDI child?")); wxFAIL_MSG(wxT("MDI parent frame is not active, yet there is no active MDI child?"));
} }
return FALSE; return false;
} }
long wxMDIParentFrame::MSWDefWindowProc(WXUINT message, long wxMDIParentFrame::MSWDefWindowProc(WXUINT message,
@@ -614,23 +614,23 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)
if ( m_currentChild && m_currentChild->GetHWND() && if ( m_currentChild && m_currentChild->GetHWND() &&
m_currentChild->MSWTranslateMessage(msg) ) m_currentChild->MSWTranslateMessage(msg) )
{ {
return TRUE; return true;
} }
// then try out accel table (will also check the menu accels) // then try out accel table (will also check the menu accels)
if ( wxFrame::MSWTranslateMessage(msg) ) if ( wxFrame::MSWTranslateMessage(msg) )
{ {
return TRUE; return true;
} }
// finally, check for MDI specific built in accel keys // finally, check for MDI specific built in accel keys
if ( pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN ) if ( pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN )
{ {
if ( ::TranslateMDISysAccel(GetWinHwnd(GetClientWindow()), pMsg)) if ( ::TranslateMDISysAccel(GetWinHwnd(GetClientWindow()), pMsg))
return TRUE; return true;
} }
return FALSE; return false;
} }
// =========================================================================== // ===========================================================================
@@ -639,7 +639,7 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)
void wxMDIChildFrame::Init() void wxMDIChildFrame::Init()
{ {
m_needsResize = TRUE; m_needsResize = true;
} }
bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
@@ -651,7 +651,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
const wxString& name) const wxString& name)
{ {
SetName(name); SetName(name);
wxWindowBase::Show(TRUE); // MDI child frame starts off shown wxWindowBase::Show(true); // MDI child frame starts off shown
if ( id > -1 ) if ( id > -1 )
m_windowId = id; m_windowId = id;
@@ -724,7 +724,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
wxModelessWindows.Append(this); wxModelessWindows.Append(this);
return TRUE; return true;
} }
wxMDIChildFrame::~wxMDIChildFrame() wxMDIChildFrame::~wxMDIChildFrame()
@@ -774,7 +774,7 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent(); wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point); ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE); MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)true);
wxSizeEvent event(wxSize(width, height), m_windowId); wxSizeEvent event(wxSize(width, height), m_windowId);
event.SetEventObject( this ); event.SetEventObject( this );
@@ -805,7 +805,7 @@ void wxMDIChildFrame::InternalSetMenuBar()
InsertWindowMenu(parent->GetClientWindow(), InsertWindowMenu(parent->GetClientWindow(),
m_hMenu, GetMDIWindowMenu(parent)); m_hMenu, GetMDIWindowMenu(parent));
parent->m_parentFrameActive = FALSE; parent->m_parentFrameActive = false;
} }
WXHICON wxMDIChildFrame::GetDefaultIcon() const WXHICON wxMDIChildFrame::GetDefaultIcon() const
@@ -858,7 +858,7 @@ long wxMDIChildFrame::MSWWindowProc(WXUINT message,
WXLPARAM lParam) WXLPARAM lParam)
{ {
long rc = 0; long rc = 0;
bool processed = FALSE; bool processed = false;
switch ( message ) switch ( message )
{ {
@@ -930,7 +930,7 @@ bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
wxMenu *popupMenu = wxCurrentPopupMenu; wxMenu *popupMenu = wxCurrentPopupMenu;
wxCurrentPopupMenu = NULL; wxCurrentPopupMenu = NULL;
if (popupMenu->MSWCommand(cmd, id)) if (popupMenu->MSWCommand(cmd, id))
return TRUE; return true;
} }
bool processed; bool processed;
@@ -940,7 +940,7 @@ bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
} }
else else
{ {
processed = FALSE; processed = false;
} }
return processed; return processed;
@@ -958,13 +958,13 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
if ( m_hWnd == hwndAct ) if ( m_hWnd == hwndAct )
{ {
activated = TRUE; activated = true;
parent->m_currentChild = this; parent->m_currentChild = this;
HMENU child_menu = (HMENU)GetWinMenu(); HMENU child_menu = (HMENU)GetWinMenu();
if ( child_menu ) if ( child_menu )
{ {
parent->m_parentFrameActive = FALSE; parent->m_parentFrameActive = false;
menuToSet = child_menu; menuToSet = child_menu;
} }
@@ -974,7 +974,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
wxASSERT_MSG( parent->m_currentChild == this, wxASSERT_MSG( parent->m_currentChild == this,
wxT("can't deactivate MDI child which wasn't active!") ); wxT("can't deactivate MDI child which wasn't active!") );
activated = FALSE; activated = false;
parent->m_currentChild = NULL; parent->m_currentChild = NULL;
HMENU parent_menu = (HMENU)parent->GetWinMenu(); HMENU parent_menu = (HMENU)parent->GetWinMenu();
@@ -983,7 +983,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
// that has been activated // that has been activated
if ( parent_menu && !hwndAct ) if ( parent_menu && !hwndAct )
{ {
parent->m_parentFrameActive = TRUE; parent->m_parentFrameActive = true;
menuToSet = parent_menu; menuToSet = parent_menu;
} }
@@ -991,7 +991,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
else else
{ {
// we have nothing to do with it // we have nothing to do with it
return FALSE; return false;
} }
if ( menuToSet ) if ( menuToSet )
@@ -1019,7 +1019,7 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
DWORD dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE); DWORD dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);
if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE)) if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE))
{ {
::AdjustWindowRectEx(&rectClient, dwStyle, FALSE, dwExStyle); ::AdjustWindowRectEx(&rectClient, dwStyle, false, dwExStyle);
lpPos->x = rectClient.left; lpPos->x = rectClient.left;
lpPos->y = rectClient.top; lpPos->y = rectClient.top;
lpPos->cx = rectClient.right - rectClient.left; lpPos->cx = rectClient.right - rectClient.left;
@@ -1033,7 +1033,7 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
} }
#endif // Win95 #endif // Win95
return FALSE; return false;
} }
bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo) bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo)
@@ -1053,17 +1053,17 @@ bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo)
{ {
info->ptMinTrackSize.x = minWidth; info->ptMinTrackSize.x = minWidth;
processed = TRUE; processed = true;
} }
if ( minHeight != -1 ) if ( minHeight != -1 )
{ {
info->ptMinTrackSize.y = minHeight; info->ptMinTrackSize.y = minHeight;
processed = TRUE; processed = true;
} }
return TRUE; return true;
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -1149,12 +1149,12 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
if (rect) if (rect)
::GetClientRect(hwndClient, rect); ::GetClientRect(hwndClient, rect);
return TRUE; return true;
} }
} }
#endif // Win95 #endif // Win95
return FALSE; return false;
} }
// =========================================================================== // ===========================================================================
@@ -1203,12 +1203,12 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
{ {
wxLogLastError(wxT("CreateWindowEx(MDI client)")); wxLogLastError(wxT("CreateWindowEx(MDI client)"));
return FALSE; return false;
} }
SubclassWin(m_hWnd); SubclassWin(m_hWnd);
return TRUE; return true;
} }
// Explicitly call default scroll behaviour // Explicitly call default scroll behaviour
@@ -1245,16 +1245,16 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF
{ {
if (GetParent()) if (GetParent())
{ {
wxNode* node = GetParent()->GetChildren().First(); wxWindowList::Node* node = GetParent()->GetChildren().GetFirst();
while (node) while (node)
{ {
wxWindow* child = (wxWindow*) node->Data(); wxWindow* child = node->GetData();
if (child->IsKindOf(CLASSINFO(wxMDIChildFrame))) if (child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
{ {
HWND hWnd = (HWND) child->GetHWND(); HWND hWnd = (HWND) child->GetHWND();
::RedrawWindow(hWnd, NULL, NULL, RDW_FRAME|RDW_ALLCHILDREN|RDW_INVALIDATE ); ::RedrawWindow(hWnd, NULL, NULL, RDW_FRAME|RDW_ALLCHILDREN|RDW_INVALIDATE );
} }
node = node->Next(); node = node->GetNext();
} }
} }
} }
@@ -1268,7 +1268,7 @@ void wxMDIChildFrame::OnIdle(wxIdleEvent& event)
// generate an artificial size event here // generate an artificial size event here
if ( m_needsResize ) if ( m_needsResize )
{ {
m_needsResize = FALSE; // avoid any possibility of recursion m_needsResize = false; // avoid any possibility of recursion
SendSizeEvent(); SendSizeEvent();
} }
@@ -1309,7 +1309,7 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
if (subMenu) if (subMenu)
{ {
int N = GetMenuItemCount(hmenu); int N = GetMenuItemCount(hmenu);
bool success = FALSE; bool success = false;
for ( int i = 0; i < N; i++ ) for ( int i = 0; i < N; i++ )
{ {
wxChar buf[256]; wxChar buf[256];
@@ -1323,7 +1323,7 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) ) if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) )
{ {
success = TRUE; success = true;
::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING, ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
(UINT)subMenu, _("&Window")); (UINT)subMenu, _("&Window"));
break; break;
@@ -1385,7 +1385,7 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact) WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact)
{ {
#ifdef __WIN32__ #ifdef __WIN32__
*activate = TRUE; *activate = true;
*hwndAct = (WXHWND)lParam; *hwndAct = (WXHWND)lParam;
*hwndDeact = (WXHWND)wParam; *hwndDeact = (WXHWND)wParam;
#else // Win16 #else // Win16