Rework modal dialog code to not depend on now obsolete wxDIALOG_MODAL flag.

[wxWidgets.git] / contrib / src / fl / cbcustom.cpp

diff --git a/contrib/src/fl/cbcustom.cpp b/contrib/src/fl/cbcustom.cpp
index 61a14859c4e83d35bd94e3de19f7f28d502c8c54..8dbf3430e0dc8b0696b6643c707c8cdf9d7116aa 100644 (file)
--- a/contrib/src/fl/cbcustom.cpp
+++ b/contrib/src/fl/cbcustom.cpp
@@ -97,8 +97,8 @@ void cbSimpleCustomizationPlugin::OnCustomizeBar( cbCustomizeBarEvent& event )
 
 void cbSimpleCustomizationPlugin::OnCustomizeLayout( cbCustomizeLayoutEvent& event )
 {
-       wxString helpStr1 = "Select this item to show the corresponding control bar";
-       wxString helpStr2 = "Select this itme to hide the corresponding control bar";
+       wxString helpStr1 = wxT("Select this item to show the corresponding control bar");
+       wxString helpStr2 = wxT("Select this itme to hide the corresponding control bar");
 
        int id = CB_CUSTOMIZE_MENU_FIRST_ITEM_ID;
 
@@ -121,8 +121,11 @@ void cbSimpleCustomizationPlugin::OnCustomizeLayout( cbCustomizeLayoutEvent& eve
                ++id;
        }
 
+    // Customization dialog not implemented, so don't show the menu item
+#if 0
        pMenu->AppendSeparator();
        pMenu->Append( id, "Customize...", "Show layout customization dialog", FALSE );
+#endif    
        mCustMenuItemId = id;
 
        cbContextMenuHandler* pHandler = new cbContextMenuHandler();
@@ -150,7 +153,7 @@ void cbSimpleCustomizationPlugin::OnMenuItemSelected( wxCommandEvent& event )
 {
        if ( event.GetId() == mCustMenuItemId )
        {
-               wxMessageBox("Customization dialog box is not supported by this plugin yet");
+               wxMessageBox(wxT("Customization dialog box is not supported by this plugin yet"));
 
                return;
        }
@@ -164,7 +167,7 @@ void cbSimpleCustomizationPlugin::OnMenuItemSelected( wxCommandEvent& event )
 
                // "inverse" bar-visibility of the selected bar
 
-               int newState = 0;
+               int newState;
 
                if ( pBar->mState == wxCBAR_HIDDEN )
                {