generate #line references to source .xrc files in wxrc --gettext (patch #1803492...

[wxWidgets.git] / samples / xrc / derivdlg.cpp

diff --git a/samples/xrc/derivdlg.cpp b/samples/xrc/derivdlg.cpp
index 64cda9224f638a85fea630876667fef66be97706..6a6da8a9a21f36b5182f25310c358ea4d4f1e0db 100644 (file)
--- a/samples/xrc/derivdlg.cpp
+++ b/samples/xrc/derivdlg.cpp
@@ -7,14 +7,6 @@
 // Licence:     wxWindows licence
 //-----------------------------------------------------------------------------
 
 // Licence:     wxWindows licence
 //-----------------------------------------------------------------------------
 

-//-----------------------------------------------------------------------------
-// GCC implementation
-//-----------------------------------------------------------------------------
-
-#ifdef __GNUG__
-    #pragma implementation "derivdlg.h"
-#endif
-

 //-----------------------------------------------------------------------------
 // Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Standard wxWidgets headers
 //-----------------------------------------------------------------------------


@@ -50,7 +42,7 @@
 
 BEGIN_EVENT_TABLE(PreferencesDialog, wxDialog)
     EVT_BUTTON( XRCID( "my_button" ), PreferencesDialog::OnMyButtonClicked )
 
 BEGIN_EVENT_TABLE(PreferencesDialog, wxDialog)
     EVT_BUTTON( XRCID( "my_button" ), PreferencesDialog::OnMyButtonClicked )

-    EVT_UPDATE_UI(XRCID( "my_checkbox" ), PreferencesDialog::OuUpdateUIMyCheckbox )
+    EVT_UPDATE_UI(XRCID( "my_checkbox" ), PreferencesDialog::OnUpdateUIMyCheckbox )

     // Note that the ID here isn't a XRCID, it is one of the standard wx ID's.
     EVT_BUTTON( wxID_OK, PreferencesDialog::OnOK )
 END_EVENT_TABLE()
     // Note that the ID here isn't a XRCID, it is one of the standard wx ID's.
     EVT_BUTTON( wxID_OK, PreferencesDialog::OnOK )
 END_EVENT_TABLE()


@@ -64,11 +56,6 @@ PreferencesDialog::PreferencesDialog(wxWindow* parent)
     wxXmlResource::Get()->LoadDialog(this, parent, wxT("derived_dialog"));
 }
 
     wxXmlResource::Get()->LoadDialog(this, parent, wxT("derived_dialog"));
 }
 

-// Destructor. (Empty, as I don't need anything special done when destructing).
-PreferencesDialog::~PreferencesDialog()
-{
-}
-

 //-----------------------------------------------------------------------------
 // Private members (including the event handlers)
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Private members (including the event handlers)
 //-----------------------------------------------------------------------------


@@ -85,7 +72,7 @@ void PreferencesDialog::OnMyButtonClicked( wxCommandEvent &WXUNUSED(event) )
 
 // Update the enabled/disabled state of the edit/delete buttons depending on
 // whether a row (item) is selected in the listctrl
 
 // Update the enabled/disabled state of the edit/delete buttons depending on
 // whether a row (item) is selected in the listctrl

-void PreferencesDialog::OuUpdateUIMyCheckbox( wxUpdateUIEvent &WXUNUSED(event) )
+void PreferencesDialog::OnUpdateUIMyCheckbox( wxUpdateUIEvent &WXUNUSED(event) )

 {
     // Get a boolean value of whether the checkbox is checked
     bool myCheckBoxIsChecked;
 {
     // Get a boolean value of whether the checkbox is checked
     bool myCheckBoxIsChecked;