rc.right - rc.left, rc.bottom - rc.top,
GetHwnd(),
NULL,
- wxhInstance,
+ wxGetInstance(),
NULL
);
}
// use the top level window as parent if none specified
- if ( !m_parent )
- m_parent = GetParentForModalDialog();
+ m_parent = GetParentForModalDialog();
HWND hWnd = m_parent ? GetHwndOf(m_parent) : NULL;
#if wxUSE_INTL
}
}
- if (wxStyle & wxICON_EXCLAMATION)
- msStyle |= MB_ICONEXCLAMATION;
- else if (wxStyle & wxICON_HAND)
- msStyle |= MB_ICONHAND;
- else if (wxStyle & wxICON_INFORMATION)
- msStyle |= MB_ICONINFORMATION;
- else if (wxStyle & wxICON_QUESTION)
- msStyle |= MB_ICONQUESTION;
+ // set the icon style
+ switch ( GetEffectiveIcon() )
+ {
+ case wxICON_ERROR:
+ msStyle |= MB_ICONHAND;
+ break;
+
+ case wxICON_WARNING:
+ msStyle |= MB_ICONEXCLAMATION;
+ break;
+
+ case wxICON_QUESTION:
+ msStyle |= MB_ICONQUESTION;
+ break;
+
+ case wxICON_INFORMATION:
+ msStyle |= MB_ICONINFORMATION;
+ break;
+ }
if ( wxStyle & wxSTAY_ON_TOP )
msStyle |= MB_TOPMOST;