somehow log target wasn't being created automatically anymore. Restored.

[wxWidgets.git] / src / msw / menuitem.cpp

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 8d7d27379b32423dbca876932851f8f5e0d658d9..46625d1a080f324ac263ed3c74249268bd188d90 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -54,7 +54,7 @@
 // -----------
 
 wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
 // -----------
 
 wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,

-                       const wxTString& strName, const wxTString& strHelp,
+                       const wxString& strName, const wxString& strHelp,

                        bool bCheckable,
                        wxMenu *pSubMenu) :
 #if USE_OWNER_DRAWN
                        bool bCheckable,
                        wxMenu *pSubMenu) :
 #if USE_OWNER_DRAWN


@@ -67,7 +67,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
 {
   wxASSERT( pParentMenu != NULL );
 
 {
   wxASSERT( pParentMenu != NULL );
 

-#ifdef  USE_OWNER_DRAWN
+#if  USE_OWNER_DRAWN

     // set default menu colors
     #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))
     
     // set default menu colors
     #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))
     


@@ -134,7 +134,7 @@ void wxMenuItem::Enable(bool bDoEnable)
 
 void wxMenuItem::Check(bool bDoCheck)
 {
 
 void wxMenuItem::Check(bool bDoCheck)
 {

-  wxCHECK ( IsCheckable() );
+  wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );

 
   if ( m_bChecked != bDoCheck ) {
     CheckMenuItem((HMENU)m_pParentMenu->GetHMenu(), m_idItem, 
 
   if ( m_bChecked != bDoCheck ) {
     CheckMenuItem((HMENU)m_pParentMenu->GetHMenu(), m_idItem,