don't use border styles for windows in wxUniversal

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

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index 67bceb9169bb7746f38ec307e6958b4da034597d..c82ec80f85545c40e129f678c9d0b16d98d74a93 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,57 +40,27 @@ 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();
 {
   DECLARE_DYNAMIC_CLASS(wxApp)
   wxApp();

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

 
   virtual int MainLoop();
 
   virtual int MainLoop();

-  void ExitMainLoop();
-  bool Initialized();
+  virtual void ExitMainLoop();
+  virtual bool Initialized();

   virtual bool Pending() ;
   virtual void Dispatch() ;
   virtual bool Pending() ;
   virtual void Dispatch() ;

+  virtual bool Yield(bool onlyIfNeeded = FALSE);

 
 

-  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; }
-
-  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; }
+  virtual wxIcon GetStdIcon(int which) const;
+  virtual void SetPrintMode(int mode) { m_printMode = mode; }
+  virtual int GetPrintMode() const { return m_printMode; }

 
 

-  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; }
+  // 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.
 
   // Send idle event to all top-level windows.
   // Returns TRUE if more idle time is requested.


@@ -98,33 +68,17 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
 
   // Send idle event to window and all subwindows
   // Returns TRUE if more idle time is requested.
 
   // Send idle event to window and all subwindows
   // Returns TRUE if more idle time is requested.

-  bool SendIdleEvents(wxWindow* win);
+  bool SendIdleEvents(wxWindowMac* win);

 
   // Windows only, but for compatibility...
   inline void SetAuto3D(bool flag) { m_auto3D = flag; }
   inline bool GetAuto3D() const { return m_auto3D; }
 
 
   // Windows only, but for compatibility...
   inline void SetAuto3D(bool flag) { m_auto3D = flag; }
   inline bool GetAuto3D() const { return m_auto3D; }
 

-  // Creates a log object
-  virtual wxLog* CreateLogTarget();
-
-public:
-  // Will always be set to the appropriate, main-style values.
-  int                   argc;
-  char **               argv;
-

 protected:
 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
   bool                  m_showOnInit;
   int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
   bool                  m_auto3D ;   // Always use 3D controls, except
                                  // where overriden

-  static wxAppInitializerFunction      m_appInitFn;
-

 public:
 
   // Implementation
 public:
 
   // Implementation


@@ -133,19 +87,119 @@ public:
 
   void DeletePendingObjects();
   bool ProcessIdle();
 
   void DeletePendingObjects();
   bool ProcessIdle();

+  bool IsExiting() { return !m_keepGoing ; }

 
 public:
   static long           sm_lastMessageTime;
 
 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 ;
 
   int                   m_nCmdShow;
 
 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 ;
+
+       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 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()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

+class WXDLLEXPORT wxStAppResource
+{
+public :
+    wxStAppResource() ;
+    ~wxStAppResource() ;
+private :
+    short m_currentRefNum ;
+} ;
+

 // TODO: add platform-specific arguments
 // TODO: add platform-specific arguments

-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+int WXDLLEXPORT wxEntry( int argc, char *argv[] , bool enterLoop = TRUE);
+
+void wxMacConvertFromPCForControls( char * p ) ;
+
+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 ) ;
+
+// converts this string into a pascal with optional pc 2 mac encoding
+void wxMacStringToPascal( const char * from , unsigned char* to , bool pc2macEncoding ) ;
+
+// 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 ) ; }
+
+// 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 ) ; }
+
+// converts this c string into a wxString with optional mac 2 pc encoding
+wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) ;
+
+// 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_