wxHtmlHelpController derives from wxHelpControllerBase

[wxWidgets.git] / samples / combo / combo.cpp

diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp
index e31bcee2e02eeaed375208eada88d05265743c8b..7710587b7379612cb7d625f26a3b9a33d47b3ba7 100644 (file)
--- a/samples/combo/combo.cpp
+++ b/samples/combo/combo.cpp
@@ -45,7 +45,7 @@
 
 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
 
 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 


@@ -624,7 +624,7 @@ MyFrame::MyFrame(const wxString& title)
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(ComboCtrl_About, wxT("&About...\tF1"), wxT("Show about dialog"));
+    helpMenu->Append(ComboCtrl_About, wxT("&About\tF1"), wxT("Show about dialog"));

 
     fileMenu->Append(ComboCtrl_Compare, wxT("&Compare against wxComboBox..."),
         wxT("Show some wxOwnerDrawnComboBoxes side-by-side with native wxComboBoxes."));
 
     fileMenu->Append(ComboCtrl_Compare, wxT("&Compare against wxComboBox..."),
         wxT("Show some wxOwnerDrawnComboBoxes side-by-side with native wxComboBoxes."));


@@ -927,7 +927,7 @@ MyFrame::MyFrame(const wxString& title)
     panel->SetSizer( topSizer );
     topSizer->SetSizeHints( panel );
 
     panel->SetSizer( topSizer );
     topSizer->SetSizeHints( panel );
 

-    SetSize(740,400);
+    Fit();

     Centre();
 }
 
     Centre();
 }