Small fixes after wxHtmlTagHandler::GetParser() addition.

[wxWidgets.git] / utils / helpview / src / client.cpp

diff --git a/utils/helpview/src/client.cpp b/utils/helpview/src/client.cpp
index 66dc71fde5501bb16d9d9bf4b320029cb8579227..bc45c5dfdc32ab39ea7e668fb69e0a9b6860ed9e 100644 (file)
--- a/utils/helpview/src/client.cpp
+++ b/utils/helpview/src/client.cpp
@@ -45,7 +45,7 @@
 //#define wxUSE_DDE_FOR_IPC 0
 #include <wx/ipc.h>
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
 #include "mondrian.xpm"
 #endif
 
@@ -182,7 +182,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
     // Make a panel
     m_panel = new wxPanel(this );
 
-    m_modalbutton = new wxButton( this, BUTTON_MODAL, "Modal Dialog", 
+    m_modalbutton = new wxButton( this, BUTTON_MODAL, "Modal Dialog",
     wxPoint(10,10), wxDefaultSize );
 }
 
@@ -266,7 +266,6 @@ MyModalDialog::MyModalDialog(wxWindow *parent)
     sizerTop->Add(m_book1, 0, wxALIGN_CENTER | wxALL, 5);
     sizerTop->Add(m_book2, 0, wxALIGN_CENTER | wxALL, 5);
 
-    SetAutoLayout(true);
     SetSizer(sizerTop);
 
     sizerTop->SetSizeHints(this);