eliminate possibility of configure enabling gnomeprint with GTK3

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

diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index af34173fa0d985911bc9f06af926f5ccb5874125..94a17e5112b2f32d8c0d81972b62c2ba8a0fd660 100644 (file)
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -241,7 +241,7 @@ MyFrame::MyFrame()
                  wxDefaultPosition, wxSize(500, 500))
 {
     // set the frame icon
                  wxDefaultPosition, wxSize(500, 500))
 {
     // set the frame icon

-    SetIcon(wxIcon(sample_xpm));
+    SetIcon(wxICON(sample));

 
 #if wxUSE_MENUS
     // create a menu bar
 
 #if wxUSE_MENUS
     // create a menu bar


@@ -281,7 +281,7 @@ MyFrame::MyFrame()
 
     // 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(HtmlLbox_About, wxT("&About...\tF1"), wxT("Show about dialog"));
+    helpMenu->Append(HtmlLbox_About, wxT("&About\tF1"), wxT("Show about dialog"));

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();


@@ -449,7 +449,7 @@ void MyFrame::OnGetItemRect(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {
     wxColour col = wxGetColourFromUser(this, m_hlbox->GetBackgroundColour());
 void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {
     wxColour col = wxGetColourFromUser(this, m_hlbox->GetBackgroundColour());

-    if ( col.Ok() )
+    if ( col.IsOk() )

     {
         m_hlbox->SetBackgroundColour(col);
         m_hlbox->Refresh();
     {
         m_hlbox->SetBackgroundColour(col);
         m_hlbox->Refresh();


@@ -463,7 +463,7 @@ void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnSetSelBgCol(wxCommandEvent& WXUNUSED(event))
 {
     wxColour col = wxGetColourFromUser(this, m_hlbox->GetSelectionBackground());
 void MyFrame::OnSetSelBgCol(wxCommandEvent& WXUNUSED(event))
 {
     wxColour col = wxGetColourFromUser(this, m_hlbox->GetSelectionBackground());

-    if ( col.Ok() )
+    if ( col.IsOk() )

     {
         m_hlbox->SetSelectionBackground(col);
         m_hlbox->Refresh();
     {
         m_hlbox->SetSelectionBackground(col);
         m_hlbox->Refresh();