wxUSE_NEW_GRID is no longer used

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index c6e1348015ff006f8b9d87f0a8306ba66f122892..a66a53109036abcfe3963451d298363b924d8a80 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -36,14 +36,17 @@ public:
     virtual ~wxApp();
 
     // override base class (pure) virtuals
     virtual ~wxApp();
 
     // override base class (pure) virtuals

+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+

     virtual int MainLoop();
     virtual void ExitMainLoop();
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
     virtual int MainLoop();
     virtual void ExitMainLoop();
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();

-    virtual bool Yield(bool onlyIfNeeded = FALSE);

 
 

-    virtual wxIcon GetStdIcon(int which) const;
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual void WakeUpIdle();

 
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual int GetPrintMode() const { return m_printMode; }
 
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual int GetPrintMode() const { return m_printMode; }


@@ -53,36 +56,17 @@ public:
     void OnEndSession(wxCloseEvent& event);
     void OnQueryEndSession(wxCloseEvent& event);
 
     void OnEndSession(wxCloseEvent& event);
     void OnQueryEndSession(wxCloseEvent& event);
 

-    // Send idle event to all top-level windows.
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents();
-
-    // Send idle event to window and all subwindows
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents(wxWindow* win);
-
-    void SetAuto3D(bool flag) { m_auto3D = flag; }
-    bool GetAuto3D() const { return m_auto3D; }
-

 protected:
 protected:

-    bool   m_showOnInit;

     int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
     int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT

-    bool   m_auto3D ;   // Always use 3D controls, except where overriden

 
     /* Windows-specific wxApp definitions */
 
 public:
 
     // Implementation
 
     /* Windows-specific wxApp definitions */
 
 public:
 
     // Implementation

-    static bool Initialize();
-    static void CleanUp();
-

     static bool RegisterWindowClasses();
     static bool UnregisterWindowClasses();
 
     static bool RegisterWindowClasses();
     static bool UnregisterWindowClasses();
 

-    // Convert Windows to argc, argv style
-    void ConvertToStandardCommandArgs(const char* p);
-

     // message processing
     // ------------------
 
     // message processing
     // ------------------
 


@@ -98,9 +82,6 @@ public:
     // idle processing
     // ---------------
 
     // idle processing
     // ---------------
 

-    void DeletePendingObjects();
-    bool ProcessIdle();
-

 #if wxUSE_RICHEDIT
     // initialize the richedit DLL of (at least) given version, return TRUE if
     // ok (Win95 has version 1, Win98/NT4 has 1 and 2, W2K has 3)
 #if wxUSE_RICHEDIT
     // initialize the richedit DLL of (at least) given version, return TRUE if
     // ok (Win95 has version 1, Win98/NT4 has 1 and 2, W2K has 3)


@@ -112,21 +93,20 @@ public:
     static int GetComCtl32Version();
 
 public:
     static int GetComCtl32Version();
 
 public:

-    int               m_nCmdShow;
+    // the SW_XXX value to be used for the frames opened by the application
+    // (currently seems unused which is a bug -- TODO)
+    static int m_nCmdShow;

 
 protected:
 
 protected:

-    bool              m_keepGoing;
+    // we exit the main event loop when this flag becomes false
+    bool m_keepGoing;

 
     DECLARE_EVENT_TABLE()
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxApp)

 };
 
 };
 

-#if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))

 int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance,
 int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance,

-                        char *lpszCmdLine, int nCmdShow, bool enterLoop = TRUE);
-#else
-int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
-#endif
+                        char *lpszCmdLine, int nCmdShow);

 
 

-#endif
-    // _WX_APP_H_
+#endif // _WX_APP_H_