Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / samples / stc / stctest.cpp

diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index 4b5a4658a29792a0c7595a16a21f170b68a0e2ea..93eb644522023e4208b4c4320d8aad4b4ff1facd 100644 (file)
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -39,10 +39,6 @@
 #include "edit.h"        // Edit module
 #include "prefs.h"       // Prefs
 
 #include "edit.h"        // Edit module
 #include "prefs.h"       // Prefs
 

-#ifndef __WXMSW__
-    #include "../sample.xpm"
-#endif
-

 //----------------------------------------------------------------------------
 // resources
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // resources
 //----------------------------------------------------------------------------


@@ -230,7 +226,6 @@ bool App::OnInit () {
     // open application frame
     m_frame->Layout ();
     m_frame->Show (true);
     // open application frame
     m_frame->Layout ();
     m_frame->Show (true);

-    SetTopWindow (m_frame);

 
     return true;
 }
 
     return true;
 }


@@ -435,7 +430,7 @@ void AppFrame::OnPrintPreview (wxCommandEvent &WXUNUSED(event)) {
         new wxPrintPreview (new EditPrint (m_edit),
                             new EditPrint (m_edit),
                             &printDialogData);
         new wxPrintPreview (new EditPrint (m_edit),
                             new EditPrint (m_edit),
                             &printDialogData);

-    if (!preview->Ok()) {
+    if (!preview->IsOk()) {

         delete preview;
         wxMessageBox (_("There was a problem with previewing.\n\
                          Perhaps your current printer is not correctly?"),
         delete preview;
         wxMessageBox (_("There was a problem with previewing.\n\
                          Perhaps your current printer is not correctly?"),


@@ -682,17 +677,13 @@ AppAbout::AppAbout (wxWindow *parent,
 }
 
 AppAbout::~AppAbout () {
 }
 
 AppAbout::~AppAbout () {

-    if (m_timer)  {
-        delete m_timer;
-        m_timer = NULL;
-    }
+    wxDELETE(m_timer);

 }
 
 //----------------------------------------------------------------------------
 // event handlers
 void AppAbout::OnTimerEvent (wxTimerEvent &WXUNUSED(event)) {
 }
 
 //----------------------------------------------------------------------------
 // event handlers
 void AppAbout::OnTimerEvent (wxTimerEvent &WXUNUSED(event)) {

-    if (m_timer) delete m_timer;
-    m_timer = NULL;
+    wxDELETE(m_timer);

     EndModal (wxID_OK);
 }
 
     EndModal (wxID_OK);
 }