Add wxRibbonButtonBar::GetItem(), GetItemById() and GetItemId().

[wxWidgets.git] / samples / config / conftest.cpp

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index c30baf42714b187d0ac1c163df17e7414123fbcc..dd903e237854066b97bad0b9b6eeda8f5619c5c4 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -29,7 +29,7 @@
 #include "wx/log.h"
 #include "wx/config.h"
 
 #include "wx/log.h"
 #include "wx/config.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

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


@@ -119,7 +119,6 @@ bool MyApp::OnInit()
     // create the main program window
     MyFrame *frame = new MyFrame;
     frame->Show(true);
     // create the main program window
     MyFrame *frame = new MyFrame;
     frame->Show(true);

-    SetTopWindow(frame);

 
     // use our config object...
     if ( pConfig->Read(wxT("/Controls/Check"), 1l) != 0 ) {
 
     // use our config object...
     if ( pConfig->Read(wxT("/Controls/Check"), 1l) != 0 ) {