Toolbar/tooltip udates

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

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index 7cab45cffaf21682e922de8bc82ae77dbbcfa63e..5f269ffc052567003c87459ed7ec5ee62f8e4769 100644 (file)
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -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,138 +40,176 @@ 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() {}
-
-  static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
-  static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
-
-  virtual int MainLoop();
-  void ExitMainLoop();
-  bool Initialized();
-  virtual bool Pending() ;
-  virtual void Dispatch() ;
-
-  void OnIdle(wxIdleEvent& event);
-
-// Generic
-  virtual bool OnInit() { return FALSE; };
-
-  // No specific tasks to do here.
-  virtual bool OnInitGui() { return TRUE; }
-
-  // Called to set off the main loop
-  virtual int OnRun() { return MainLoop(); };
-  virtual int OnExit() { return 0; }
-
-
-  /** Returns the standard icons for the msg dialogs, implemented in 
-      src/generic/msgdlgg.cpp and src/gtk/app.cpp. */
-  virtual wxIcon GetStdIcon(int which) const;
-
-  inline void SetPrintMode(int mode) { m_printMode = mode; }
-  inline int GetPrintMode() const { return m_printMode; }
-
-  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();
-
-  // Send idle event to window and all subwindows
-  // Returns TRUE if more idle time is requested.
-  bool SendIdleEvents(wxWindow* win);
+    DECLARE_DYNAMIC_CLASS(wxApp)
+        
+    wxApp();
+    virtual ~wxApp() {}
+
+    virtual int MainLoop();
+    virtual void ExitMainLoop();
+    virtual bool Initialized();
+    virtual bool Pending() ;
+    virtual void Dispatch() ;
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    
+    virtual void SetPrintMode(int mode) { m_printMode = mode; }
+    virtual int GetPrintMode() const { return m_printMode; }
+    
+    // implementation only
+    void OnIdle(wxIdleEvent& 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(wxWindowMac* win);
+    
+    // Windows only, but for compatibility...
+    inline void SetAuto3D(bool flag) { m_auto3D = flag; }
+    inline bool GetAuto3D() const { return m_auto3D; }
+    
+protected:
+    bool                  m_showOnInit;
+    int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
+    bool                  m_auto3D ;   // Always use 3D controls, except
+                                       // where overriden
+public:

 
 

-  // Windows only, but for compatibility...
-  inline void SetAuto3D(bool flag) { m_auto3D = flag; }
-  inline bool GetAuto3D() const { return m_auto3D; }
+    // Implementation
+    static bool Initialize();
+    static void CleanUp();
+    
+    virtual bool OnInit();
+    void DeletePendingObjects();
+    bool ProcessIdle();
+    bool IsExiting() { return !m_keepGoing ; }
+    
+public:
+    static long           sm_lastMessageTime;
+    static wxWindow*      s_captureWindow ;
+    static int            s_lastMouseDown ; // 0 = none , 1 = left , 2 = right
+    static WXHRGN         s_macCursorRgn ;
+    WXEVENTREF            m_macCurrentEvent ;
+    
+    int                   m_nCmdShow;
+    
+protected:
+    bool                  m_keepGoing ;

 
 

-  // Creates a log object
-  virtual wxLog* CreateLogTarget();
+    // mac specifics

 
 public:
 
 public:

-  // Will always be set to the appropriate, main-style values.
-  int                   argc;
-  char **               argv;
-
-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;
+    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 ;
+
+    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() ;
+
+    // event main methods
+
+    void                  MacDoOneEvent() ;
+    void                  MacHandleOneEvent( WXEVENTREF ev ) ;
+    WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
+  
+    // primary events
+       
+    virtual void          MacHandleMouseDownEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleMouseUpEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleActivateEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleUpdateEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleKeyDownEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleKeyUpEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleDiskEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleOSEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleHighLevelEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleMenuSelect( int menuid , int menuitem ) ;
+    
+    virtual bool          MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
+    virtual bool          MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
+    
+    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) ;
+    
+    DECLARE_EVENT_TABLE()
+};

 
 

+class WXDLLEXPORT wxStAppResource
+{

 public:
 public:

+    wxStAppResource() ;
+    ~wxStAppResource() ;

 
 

-  // Implementation
-  static bool Initialize();
-  static void CleanUp();
+    // opaque pointer for CFragInitBlock
+    static void OpenSharedLibraryResource(const void *) ;
+    static void CloseSharedLibraryResource() ;
+    
+private:    
+    short       m_currentRefNum ;
+} ;

 
 

-  void DeletePendingObjects();
-  bool ProcessIdle();
+// TODO: add platform-specific arguments
+int WXDLLEXPORT wxEntry( int argc, char *argv[] , bool enterLoop = TRUE);

 
 

-public:
-  static long           sm_lastMessageTime;
-  int                   m_nCmdShow;
+void wxMacConvertFromPCForControls( char * p ) ;

 
 

-protected:
-  bool                  m_keepGoing ;
+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 ) ;

 
 

-// mac specifics
+// converts this string into a pascal with optional pc 2 mac encoding
+void wxMacStringToPascal( const char * from , unsigned char* to , bool pc2macEncoding ) ;

 
 

-public :
+// converts this string into a pascal with pc 2 mac encoding if s_macDefaultEncodingIsPC
+inline void wxMacStringToPascal( const char * from , unsigned char*  to ) 
+  { wxMacStringToPascal( from , to , wxApp::s_macDefaultEncodingIsPC ) ; }

 
 

-       void                                                                    MacDoOneEvent() ;
-       
-       void                                                                    MacHandleOneEvent( EventRecord *ev ) ;
-  void                  MacHandleNullEvent( EventRecord *ev ) ;
-  void                  MacHandleHighLevelEvent( EventRecord *ev ) ;
-  void                  MacHandleMouseDownEvent( EventRecord *ev ) ;
-  void                  MacHandleMouseUpEvent( EventRecord *ev ) ;
-  void                  MacHandleKeyDownEvent( EventRecord *ev ) ;
-  void                  MacHandleKeyUpEvent( EventRecord *ev ) ;
-  void                  MacHandleAutoKeyEvent( EventRecord *ev ) ;
-  void                  MacHandleActivateEvent( EventRecord *ev ) ;
-  void                  MacHandleUpdateEvent( EventRecord *ev ) ;
-  void                  MacHandleDiskEvent( EventRecord *ev ) ;
-  void                  MacHandleOSEvent( EventRecord *ev ) ;
+// converts this string into a pascal with optional mac 2 pc encoding
+wxString wxMacMakeStringFromPascal( unsigned char*  from , bool mac2pcEncoding ) ;

 
 

-       
+// converts this pascal string into a wxString with pc 2 mac encoding if s_macDefaultEncodingIsPC
+inline wxString wxMacMakeStringFromPascal( unsigned char*  from  ) 
+  { return wxMacMakeStringFromPascal( from , wxApp::s_macDefaultEncodingIsPC ) ; }

 
 

-DECLARE_EVENT_TABLE()
-};
+// converts this c string into a wxString with optional mac 2 pc encoding
+wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) ;

 
 

-// TODO: add platform-specific arguments
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+// converts this c string into a wxString with pc 2 mac encoding if s_macDefaultEncodingIsPC
+inline wxString wxMacMakeStringFromMacString( const char* from  ) 
+  { return wxMacMakeStringFromMacString( from , wxApp::s_macDefaultEncodingIsPC ) ; }

 
 #endif
     // _WX_APP_H_
 
 #endif
     // _WX_APP_H_