#endif
}
+wxBorder wxWindowMSW::GetDefaultBorder() const
+{
+ return GetDefaultBorderForControl();
+}
+
WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
{
// translate common wxWidgets styles to Windows ones
switch ( border )
{
- default:
- case wxBORDER_DEFAULT:
- wxFAIL_MSG( _T("unknown border style") );
- // fall through
+ case wxBORDER_DEFAULT: // also wxBORDER_THEME
+ break;
case wxBORDER_NONE:
case wxBORDER_SIMPLE:
- case wxBORDER_THEME:
break;
case wxBORDER_STATIC:
style &= ~WS_BORDER;
break;
-// case wxBORDER_DOUBLE:
-// *exstyle |= WS_EX_DLGMODALFRAME;
-// break;
+ default:
+ wxFAIL_MSG( _T("unknown border style") );
+ break;
+
+ case wxBORDER_DOUBLE:
+ *exstyle |= WS_EX_DLGMODALFRAME;
+ break;
}
// wxUniv doesn't use Windows dialog navigation functions at all
bool wxWindowMSW::HandleEnterSizeMove()
{
- wxMoveEvent event(wxPoint(), m_windowId);
+ wxMoveEvent event(wxPoint(0,0), m_windowId);
event.SetEventType(wxEVT_MOVE_START);
event.SetEventObject(this);
bool wxWindowMSW::HandleExitSizeMove()
{
- wxMoveEvent event(wxPoint(), m_windowId);
+ wxMoveEvent event(wxPoint(0,0), m_windowId);
event.SetEventType(wxEVT_MOVE_END);
event.SetEventObject(this);
// menu creation code
wxMenuItem *item = (wxMenuItem*)mii.dwItemData;
- const wxChar *p = wxStrchr(item->GetText().wx_str(), _T('&'));
+ const wxChar *p = wxStrchr(item->GetItemLabel().wx_str(), _T('&'));
while ( p++ )
{
if ( *p == _T('&') )