merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/dialoged/src/dialoged.h

@@ -26,16 +26,16 @@ class MyChild;
 // Define a new application
 class MyApp: public wxApp
 {
-  public:
+public:
     MyApp(void);
     bool OnInit(void);
     int OnExit(void);
-
+    
     void OnObjectPopupMenu(wxCommandEvent& event)
     {
         ObjectMenuProc((wxMenu *)event.GetEventObject(), event);
     }
-
+    
 private:
     DECLARE_EVENT_TABLE()
 };