Open Watcom doesn't like typename, use class (patch 826812)

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

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index 4d50c75d0612664aa5945445b8fc3408c8bef15c..94e28ec345f9854435d425e66a29b41662e0d55a 100644 (file)
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        app.h
 // Purpose:     wxApp class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        app.h
 // Purpose:     wxApp class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 

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

 #pragma interface "app.h"
 #endif
 
 #pragma interface "app.h"
 #endif
 


@@ -22,7 +22,7 @@
 #include "wx/event.h"
 
 class WXDLLEXPORT wxFrame;
 #include "wx/event.h"
 
 class WXDLLEXPORT wxFrame;

-class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxWindowMac;

 class WXDLLEXPORT wxApp ;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxApp ;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;


@@ -40,181 +40,159 @@ bool WXDLLEXPORT wxYield();
 
 // 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

-class WXDLLEXPORT wxApp: public wxEvtHandler
+class WXDLLEXPORT wxApp: public wxAppBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxApp)
-  wxApp();
-  inline ~wxApp() {}
+    DECLARE_DYNAMIC_CLASS(wxApp)

 
 

-  static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
-  static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
+    wxApp();
+    virtual ~wxApp() {}

 
 

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

 
 

-  void OnIdle(wxIdleEvent& event);
+    virtual void Exit();

 
 

-// Generic
-  virtual bool OnInit() { return FALSE; };
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual void WakeUpIdle();

 
 

-  // No specific tasks to do here.
-  virtual bool OnInitGui() { return TRUE; }
+    virtual void SetPrintMode(int mode) { m_printMode = mode; }
+    virtual int GetPrintMode() const { return m_printMode; }

 
 

-  // Called to set off the main loop
-  virtual int OnRun() { return MainLoop(); };
-  virtual int OnExit() { return 0; }
+#if wxUSE_GUI
+    // setting up all MacOS Specific Event-Handlers etc
+    virtual bool OnInitGui();
+#endif // wxUSE_GUI
+    // implementation only
+    void OnIdle(wxIdleEvent& event);
+    void OnEndSession(wxCloseEvent& event);
+    void OnQueryEndSession(wxCloseEvent& event);

 
 

-  inline void SetPrintMode(int mode) { m_printMode = mode; }
-  inline int GetPrintMode() const { return m_printMode; }
+    // Windows only, but for compatibility...
+    inline void SetAuto3D(bool flag) { m_auto3D = flag; }
+    inline bool GetAuto3D() const { return m_auto3D; }

 
 

-  inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
-  inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
-
-  inline wxString GetAppName() const {
-      if (m_appName != "")
-        return m_appName;
-      else return m_className;
-    }
-
-  inline void SetAppName(const wxString& name) { m_appName = name; };
-  inline wxString GetClassName() const { return m_className; }
-  inline void SetClassName(const wxString& name) { m_className = name; }
-
-  void SetVendorName(const wxString& vendorName) { m_vendorName = vendorName; }
-  const wxString& GetVendorName() const { return m_vendorName; }
-
-  wxWindow *GetTopWindow() const ;
-  inline void SetTopWindow(wxWindow *win) { m_topWindow = win; }
-
-  inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-  inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
-
-  // Send idle event to all top-level windows.
-  // Returns TRUE if more idle time is requested.
-  bool SendIdleEvents();
+protected:
+    bool                  m_showOnInit;
+    int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
+    bool                  m_auto3D ;   // Always use 3D controls, except
+                                       // where overriden
+public:

 
 

-  // Send idle event to window and all subwindows
-  // Returns TRUE if more idle time is requested.
-  bool SendIdleEvents(wxWindow* win);
+    // Implementation
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+
+    bool IsExiting() { return !m_keepGoing ; }
+#if TARGET_CARBON
+    // the installed application event handler
+    WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
+    WXEVENTHANDLERREF    MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; }
+    void MacSetCurrentEvent( WXEVENTREF event , WXEVENTHANDLERCALLREF handler )
+    { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; }
+#endif

 
 

-  // Windows only, but for compatibility...
-  inline void SetAuto3D(bool flag) { m_auto3D = flag; }
-  inline bool GetAuto3D() const { return m_auto3D; }
+public:
+    static long           sm_lastMessageTime;
+    static wxWindow*      s_captureWindow ;
+    static int            s_lastMouseDown ; // 0 = none , 1 = left , 2 = right
+    static WXHRGN         s_macCursorRgn ;
+    static long           s_lastModifiers ;

 
 

-  // Creates a log object
-  virtual wxLog* CreateLogTarget();
+    int                   m_nCmdShow;

 
 

-public:
-  // Will always be set to the appropriate, main-style values.
-  int                   argc;
-  char **               argv;
+private:
+    bool                  m_keepGoing ;

 
 

-protected:
-  bool                  m_wantDebugOutput ;
-  wxString              m_className;
-  wxString              m_appName,
-                        m_vendorName;
-  wxWindow *            m_topWindow;
-  bool                  m_exitOnFrameDelete;
-  bool                  m_showOnInit;
-  int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-  bool                  m_auto3D ;   // Always use 3D controls, except
-                                 // where overriden
-  static wxAppInitializerFunction      m_appInitFn;
+    // mac specifics
+#if TARGET_CARBON
+    WXEVENTHANDLERREF     m_macEventHandler ;
+    WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
+#endif
+    WXEVENTREF            m_macCurrentEvent ;

 
 public:
 
 public:

+    static bool           s_macSupportPCMenuShortcuts ;
+    static long           s_macAboutMenuItemId ;
+    static long           s_macPreferencesMenuItemId ;
+    static long           s_macExitMenuItemId ;
+    static wxString       s_macHelpMenuTitleName ;
+
+    static bool           s_macHasAppearance ;
+    static long           s_macAppearanceVersion ;
+    static bool           s_macHasNavigation ;
+    static bool           s_macNavigationVersion ;
+    static bool           s_macHasWindowManager ;
+    static long           s_macWindowManagerVersion ;
+    static bool           s_macHasMenuManager ;
+    static long           s_macMenuManagerVersion ;
+    static bool           s_macHasDialogManager ;
+    static long           s_macDialogManagerVersion ;
+
+    WXHRGN                m_macCursorRgn ;
+    WXHRGN                m_macSleepRgn ;
+    WXHRGN                m_macHelpRgn ;
+
+    virtual void          MacSuspend( bool convertClipboard ) ;
+    virtual void          MacResume( bool convertClipboard ) ;
+    virtual void          MacConvertPrivateToPublicScrap() ;
+    virtual void          MacConvertPublicToPrivateScrap() ;
+
+    void                  MacDoOneEvent() ;
+    WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
+    void                  MacHandleOneEvent( WXEVENTREF ev ) ;
+#if !TARGET_CARBON
+    virtual void          MacHandleMenuSelect( int menuid , int menuitem ) ;
+    virtual void          MacHandleMouseUpEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleOSEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleDiskEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleActivateEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleUpdateEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleMouseDownEvent( WXEVENTREF ev ) ;
+
+    void                  MacHandleModifierEvents( WXEVENTREF ev ) ;
+
+    virtual void          MacHandleKeyDownEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleKeyUpEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleHighLevelEvent( WXEVENTREF ev ) ;
+
+#else
+    virtual void          MacHandleMouseMovedEvent( wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp ) ;
+#endif

 
 

-  // Implementation
-  static bool Initialize();
-  static void CleanUp();
+    void                  MacHandleMenuCommand( wxUint32 command ) ;
+    bool                    MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
+    bool                    MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;

 
 

-  void DeletePendingObjects();
-  bool ProcessIdle();
+    virtual short         MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+    virtual short         MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+    virtual short         MacHandleAEOApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+    virtual short         MacHandleAEQuit(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;

 
 

-public:
-  static long           sm_lastMessageTime;
-  static wxWindow*                     s_captureWindow ;
-  static int                                           s_lastMouseDown ; // 0 = none , 1 = left , 2 = right
-  static RgnHandle                     s_macCursorRgn ;
-       EventRecord*                                    m_macCurrentEvent ;
-  
-  int                   m_nCmdShow;
+    // in response of an open-document apple event
+    virtual void         MacOpenFile(const wxString &fileName) ;
+    // in response of a print-document apple event
+    virtual void         MacPrintFile(const wxString &fileName) ;
+    // in response of a open-application apple event
+    virtual void         MacNewFile() ;

 
 

-protected:
-  bool                  m_keepGoing ;
-
-// mac specifics
-
-public :
-       static bool                                             s_macDefaultEncodingIsPC ;
-       static bool                                             s_macSupportPCMenuShortcuts ;
-       static long                                             s_macAboutMenuItemId ;
-       static wxString                         s_macHelpMenuTitleName ;
-
-  static bool                                          s_macHasAppearance ;
-  static long                                          s_macAppearanceVersion ;
-  static bool                                          s_macHasNavigation ;
-  static bool                                          s_macNavigationVersion ;
-  static bool                                          s_macHasWindowManager ;
-  static long                                          s_macWindowManagerVersion ;
-  static bool                                          s_macHasMenuManager ;
-  static long                                          s_macMenuManagerVersion ;
-  static bool                                          s_macHasDialogManager ;
-  static long                                          s_macDialogManagerVersion ;
-
-       RgnHandle                                                       m_macCursorRgn ;
-       RgnHandle                                                       m_macSleepRgn ;
-       RgnHandle                                                       m_macHelpRgn ;
-       
-  virtual void          MacSuspend( bool convertClipboard ) ;
-  virtual void          MacResume( bool convertClipboard ) ;
-
-       virtual void                                    MacConvertPrivateToPublicScrap() ;
-       virtual void                                    MacConvertPublicToPrivateScrap() ;
-
-       // event main methods
-
-       void                                                                    MacDoOneEvent() ;       
-       void                                                                    MacHandleOneEvent( EventRecord *ev ) ;
-       EventRecord*                                    MacGetCurrentEvent() { return m_macCurrentEvent ; }
-       // primary events
-       
-  virtual void          MacHandleMouseDownEvent( EventRecord *ev ) ;
-  virtual void          MacHandleMouseUpEvent( EventRecord *ev ) ;
-       virtual void          MacHandleActivateEvent( EventRecord *ev ) ;
-  virtual void          MacHandleUpdateEvent( EventRecord *ev ) ;
-  virtual void          MacHandleKeyDownEvent( EventRecord *ev ) ;
-  virtual void          MacHandleKeyUpEvent( EventRecord *ev ) ;
-  virtual void          MacHandleDiskEvent( EventRecord *ev ) ;
-  virtual void          MacHandleOSEvent( EventRecord *ev ) ;
-  virtual void                                 MacHandleHighLevelEvent( EventRecord *ev ) ;
-       virtual void                                    MacHandleMenuSelect( int menuid , int menuitem ) ;
-
-       virtual OSErr                                   MacHandleAEODoc(AppleEvent *event , AppleEvent *reply) ;
-       virtual OSErr                                   MacHandleAEPDoc(AppleEvent *event , AppleEvent *reply) ;
-       virtual OSErr                                   MacHandleAEOApp(AppleEvent *event , AppleEvent *reply) ;
-       virtual OSErr                                   MacHandleAEQuit(AppleEvent *event , AppleEvent *reply) ;
-
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

-// TODO: add platform-specific arguments
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+class WXDLLEXPORT wxStAppResource
+{
+public:
+    wxStAppResource() ;
+    ~wxStAppResource() ;

 
 

-void wxMacConvertFromPCForControls( char * p ) ;
+    // opaque pointer for CFragInitBlock
+    static void OpenSharedLibraryResource(const void *) ;
+    static void CloseSharedLibraryResource() ;

 
 

-void wxMacConvertToPC( const char *from , char *to , int len ) ;
-void wxMacConvertFromPC( const char *from , char *to , int len ) ;
-void wxMacConvertToPC( const char *from , char *to , int len ) ;
-void wxMacConvertFromPC( char * p ) ;
-void wxMacConvertFromPC( unsigned char *p ) ;
-wxString wxMacMakeMacStringFromPC( const char * p ) ;
-void wxMacConvertToPC( char * p ) ;
-void wxMacConvertToPC( unsigned char *p ) ;
-wxString wxMacMakePCStringFromMac( const char * p ) ;
+private:
+    short       m_currentRefNum ;
+} ;

 
 #endif
     // _WX_APP_H_
 
 #endif
     // _WX_APP_H_