Fix wxWrapSizer minimal size calculation.

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index d7175118e1cb4fda605e8c869162a541671fbb3b..ab41124fabfb23ad1b6d236b8cadddc487c96034 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
 
     // 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
 
     // 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
 
 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();
 public:
     // unregister any window classes registered by GetRegisteredClassName()
     static void UnregisterWindowClasses();


@@ -104,7 +102,7 @@ public:
 
 protected:
     DECLARE_EVENT_TABLE()
 
 protected:
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxApp)
+    wxDECLARE_NO_COPY_CLASS(wxApp);

     DECLARE_DYNAMIC_CLASS(wxApp)
 };
 
     DECLARE_DYNAMIC_CLASS(wxApp)
 };
 


@@ -129,7 +127,7 @@ inline int wxApp::GetShell32Version()
 #endif // __WXWINCE__
 
 // ----------------------------------------------------------------------------
 #endif // __WXWINCE__
 
 // ----------------------------------------------------------------------------

-// MSW-specific wxEntry() overload and IMPLEMENT_WXWIN_MAIN definition
+// MSW-specific wxEntry() overload and wxIMPLEMENT_WXWIN_MAIN definition

 // ----------------------------------------------------------------------------
 
 // we need HINSTANCE declaration to define WinMain()
 // ----------------------------------------------------------------------------
 
 // we need HINSTANCE declaration to define WinMain()


@@ -166,38 +164,42 @@ extern WXDLLIMPEXP_CORE int
     // command line flag is used, the linker expects to find wWinMain instead
     // of WinMain. This flag causes the compiler to define _UNICODE and
     // UNICODE symbols and there's no way to detect its use, so we have to
     // command line flag is used, the linker expects to find wWinMain instead
     // of WinMain. This flag causes the compiler to define _UNICODE and
     // UNICODE symbols and there's no way to detect its use, so we have to

-    // define both WinMain and wWinMain so that IMPLEMENT_WXWIN_MAIN works
+    // define both WinMain and wWinMain so that wxIMPLEMENT_WXWIN_MAIN works

     // for both code compiled with and without -WU.
     // See http://sourceforge.net/tracker/?func=detail&atid=309863&aid=1935997&group_id=9863
     // for more details.
     // for both code compiled with and without -WU.
     // See http://sourceforge.net/tracker/?func=detail&atid=309863&aid=1935997&group_id=9863
     // for more details.

-    #define IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD                        \
+    #define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD                      \

         extern "C" int WINAPI wWinMain(HINSTANCE hInstance,                 \
                                       HINSTANCE hPrevInstance,              \
                                       wchar_t * WXUNUSED(lpCmdLine),        \
                                       int nCmdShow)                         \
         {                                                                   \
         extern "C" int WINAPI wWinMain(HINSTANCE hInstance,                 \
                                       HINSTANCE hPrevInstance,              \
                                       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:                     */   \
             return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);       \
         }
 #else
             /* 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:                     */   \
             return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);       \
         }
 #else

-    #define IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
+    #define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD

 #endif // defined(__BORLANDC__) && wxUSE_UNICODE
 
 #endif // defined(__BORLANDC__) && wxUSE_UNICODE
 

-#define IMPLEMENT_WXWIN_MAIN \
+#define wxIMPLEMENT_WXWIN_MAIN                                              \

     extern "C" int WINAPI WinMain(HINSTANCE hInstance,                      \
                                   HINSTANCE hPrevInstance,                  \
                                   wxCmdLineArgType WXUNUSED(lpCmdLine),     \
                                   int nCmdShow)                             \
     {                                                                       \
     extern "C" int WINAPI WinMain(HINSTANCE hInstance,                      \
                                   HINSTANCE hPrevInstance,                  \
                                   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   */ \
         /*     wWinMain() above too.                                     */ \
         return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);           \
     }                                                                       \
         /* 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   */ \
         /*     wWinMain() above too.                                     */ \
         return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);           \
     }                                                                       \

-    IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
+    wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD

 
 
 #endif // _WX_APP_H_
 
 
 #endif // _WX_APP_H_