Store menus titles in menus themselves in wxOSX.

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

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index bc59d8ad1ae9ecab4a63e09dd65cc82b5d9ff599..2a9e8643ef0cf99636b1b8eaf7ea37ddffcd5588 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -39,6 +39,7 @@
 #include "wx/renderer.h"
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private/button.h"
 #include "wx/renderer.h"
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private/button.h"

+#include "wx/msw/missing.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -152,22 +153,16 @@ bool wxCheckBox::Create(wxWindow *parent,
 {
     Init();
 
 {
     Init();
 

+    WXValidateStyle(&style);

     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 
     long msStyle = WS_TABSTOP;
 
     if ( style & wxCHK_3STATE )
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 
     long msStyle = WS_TABSTOP;
 
     if ( style & wxCHK_3STATE )

-    {

         msStyle |= BS_3STATE;
         msStyle |= BS_3STATE;

-    }

     else
     else

-    {
-        wxASSERT_MSG( !Is3rdStateAllowedForUser(),
-            wxT("Using wxCH_ALLOW_3RD_STATE_FOR_USER")
-            wxT(" style flag for a 2-state checkbox is useless") );

         msStyle |= BS_CHECKBOX;
         msStyle |= BS_CHECKBOX;

-    }

 
     if ( style & wxALIGN_RIGHT )
     {
 
     if ( style & wxALIGN_RIGHT )
     {


@@ -460,7 +455,7 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG( _T("unexpected Get3StateValue() return value") );
+            wxFAIL_MSG( wxT("unexpected Get3StateValue() return value") );

             // fall through
 
         case wxCHK_UNCHECKED:
             // fall through
 
         case wxCHK_UNCHECKED:


@@ -495,7 +490,7 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         if ( !::DrawText(hdc, label.wx_str(), label.length(), &rectLabel,
                          fmt | DT_CALCRECT) )
         {
         if ( !::DrawText(hdc, label.wx_str(), label.length(), &rectLabel,
                          fmt | DT_CALCRECT) )
         {

-            wxLogLastError(_T("DrawText(DT_CALCRECT)"));
+            wxLogLastError(wxT("DrawText(DT_CALCRECT)"));

         }
     }
 
         }
     }
 


@@ -506,7 +501,7 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
     if ( !::DrawText(hdc, label.wx_str(), label.length(), &rectLabel, fmt) )
     {
 
     if ( !::DrawText(hdc, label.wx_str(), label.length(), &rectLabel, fmt) )
     {

-        wxLogLastError(_T("DrawText()"));
+        wxLogLastError(wxT("DrawText()"));

     }
 
     // finally draw the focus
     }
 
     // finally draw the focus


@@ -516,7 +511,7 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         rectLabel.right++;
         if ( !::DrawFocusRect(hdc, &rectLabel) )
         {
         rectLabel.right++;
         if ( !::DrawFocusRect(hdc, &rectLabel) )
         {

-            wxLogLastError(_T("DrawFocusRect()"));
+            wxLogLastError(wxT("DrawFocusRect()"));

         }
     }
 
         }
     }