Rebake from clean wx tree.

[wxWidgets.git] / include / wx / msw / app.h

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index d7175118e1cb4fda605e8c869162a541671fbb3b..73e01be93888dc1114d150887eee8d5cf0307bfd 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -52,7 +52,7 @@ public:
 
     // this suffix should be appended to all our Win32 class names to obtain a
     // variant registered without CS_[HV]REDRAW styles
-    static const wxChar *GetNoRedrawClassSuffix() { return _T("NR"); }
+    static const wxChar *GetNoRedrawClassSuffix() { return wxT("NR"); }
 
     // get the name of the registered Win32 class with the given (unique) base
     // name: this function constructs the unique class name using this name as
@@ -78,8 +78,6 @@ public:
 protected:
     int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 
-    virtual bool DoYield(bool onlyIfNeeded, long eventsToProcess);
-
 public:
     // unregister any window classes registered by GetRegisteredClassName()
     static void UnregisterWindowClasses();
@@ -104,7 +102,7 @@ public:
 
 protected:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxApp)
+    wxDECLARE_NO_COPY_CLASS(wxApp);
     DECLARE_DYNAMIC_CLASS(wxApp)
 };
 
@@ -176,6 +174,8 @@ extern WXDLLIMPEXP_CORE int
                                       wchar_t * WXUNUSED(lpCmdLine),        \
                                       int nCmdShow)                         \
         {                                                                   \
+            wxDISABLE_DEBUG_SUPPORT();                                      \
+                                                                            \
             /* NB: wxEntry expects lpCmdLine argument to be char*, not */   \
             /*     wchar_t*, but fortunately it's not used anywhere    */   \
             /*     and we can simply pass NULL in:                     */   \
@@ -191,6 +191,8 @@ extern WXDLLIMPEXP_CORE int
                                   wxCmdLineArgType WXUNUSED(lpCmdLine),     \
                                   int nCmdShow)                             \
     {                                                                       \
+        wxDISABLE_DEBUG_SUPPORT();                                          \
+                                                                            \
         /* NB: We pass NULL in place of lpCmdLine to behave the same as  */ \
         /*     Borland-specific wWinMain() above. If it becomes needed   */ \
         /*     to pass lpCmdLine to wxEntry() here, you'll have to fix   */ \