Renameing funktions to prevent name clashes

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

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index 67bceb9169bb7746f38ec307e6958b4da034597d..7cab45cffaf21682e922de8bc82ae77dbbcfa63e 100644 (file)
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -67,6 +67,11 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
 
   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 SetPrintMode(int mode) { m_printMode = mode; }
   inline int GetPrintMode() const { return m_printMode; }
 


@@ -141,6 +146,27 @@ public:
 protected:
   bool                  m_keepGoing ;
 
 protected:
   bool                  m_keepGoing ;
 

+// mac specifics
+
+public :
+
+       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 ) ;
+
+       
+

 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };