reverted m_adjustMinSize change prepatory for a new approach to fix

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 8f384d947b70fa00f83c088933c39356f6915648..e29c62f45b1bbe16cb3b014197d0b4df33e001c3 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -12,18 +12,18 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "app.h"
 #endif
 
 #include "wx/event.h"
 #include "wx/icon.h"
 
 #pragma interface "app.h"
 #endif
 
 #include "wx/event.h"
 #include "wx/icon.h"
 

-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp ;
-class WXDLLEXPORT wxKeyEvent;
-class WXDLLEXPORT wxLog;
+class WXDLLIMPEXP_CORE wxFrame;
+class WXDLLIMPEXP_CORE wxWindow;
+class WXDLLIMPEXP_CORE wxApp;
+class WXDLLIMPEXP_CORE wxKeyEvent;
+class WXDLLIMPEXP_BASE wxLog;

 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application


@@ -36,14 +36,10 @@ public:
     virtual ~wxApp();
 
     // override base class (pure) virtuals
     virtual ~wxApp();
 
     // override base class (pure) virtuals

-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Initialized();
-    virtual bool Pending();
-    virtual void Dispatch();
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);

-    virtual bool ProcessIdle();

     virtual void WakeUpIdle();
 
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual void WakeUpIdle();
 
     virtual void SetPrintMode(int mode) { m_printMode = mode; }


@@ -54,53 +50,18 @@ 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; }
+#if wxUSE_EXCEPTIONS
+    virtual bool OnExceptionInMainLoop();
+#endif // wxUSE_EXCEPTIONS

 
 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:
 
 public:

-

     // Implementation
     // 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
-    // ------------------
-
-    // process the given message
-    virtual void DoMessage(WXMSG *pMsg);
-
-    // retrieve the next message from the queue and process it
-    virtual bool DoMessage();
-
-    // preprocess the message
-    virtual bool ProcessMessage(WXMSG* pMsg);
-
-    // idle processing
-    // ---------------
-
-    void DeletePendingObjects();
-

 #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)


@@ -111,22 +72,17 @@ public:
     // wasn't found at all
     static int GetComCtl32Version();
 
     // wasn't found at all
     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;
-

     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_