updated mac sources (CW 5.3 working , CW6 still having code gen problems)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mac/app.h

@@ -147,10 +147,10 @@ public :
   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) ;
+	virtual OSErr					MacHandleAEODoc(const AppleEvent *event , AppleEvent *reply) ;
+	virtual OSErr					MacHandleAEPDoc(const AppleEvent *event , AppleEvent *reply) ;
+	virtual OSErr					MacHandleAEOApp(const AppleEvent *event , AppleEvent *reply) ;
+	virtual OSErr					MacHandleAEQuit(const AppleEvent *event , AppleEvent *reply) ;
 
 DECLARE_EVENT_TABLE()
 };

include/wx/mac/choice.h

@@ -26,9 +26,10 @@ class WXDLLEXPORT wxChoice: public wxControl
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
  public:
-  inline wxChoice() {}
+  wxChoice() {}
+  ~wxChoice() ;
 
-  inline wxChoice(wxWindow *parent, wxWindowID id,
+  wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            int n = 0, const wxString choices[] = NULL,

include/wx/mac/dcprint.h

@@ -33,7 +33,11 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;
  protected :
+ #if TARGET_CARBON
+ 	PMPrintContext  m_macPrintPort ;
+ #else
  	TPPrPort 	m_macPrintPort ;
+ #endif
  	wxPrintData m_printData ;
 };
 

include/wx/mac/filedlg.h

@@ -35,6 +35,8 @@ protected:
     wxString    m_dir;
     wxString    m_path; // Full path
     wxString    m_fileName;
+    wxArrayString m_fileNames;
+    wxArrayString m_paths;
     wxString    m_wildCard;
     int         m_filterIndex;
 public:
@@ -54,6 +56,8 @@ public:
     inline wxString GetPath() const { return m_path; }
     inline wxString GetDirectory() const { return m_dir; }
     inline wxString GetFilename() const { return m_fileName; }
+    void GetPaths(wxArrayString& paths) const { paths = m_paths; }
+    void GetFilenames(wxArrayString& files) const { files = m_fileNames; }
     inline wxString GetWildcard() const { return m_wildCard; }
     inline long GetStyle() const { return m_dialogStyle; }
     inline int GetFilterIndex() const { return m_filterIndex ; }

include/wx/mac/statusbr.h

@@ -23,8 +23,8 @@ class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric
 {
   DECLARE_DYNAMIC_CLASS(wxStatusBarMac);
 
-  wxStatusBarMac(void);
-  inline wxStatusBarMac(wxWindow *parent, wxWindowID id,
+  wxStatusBarMac();
+   wxStatusBarMac(wxWindow *parent, wxWindowID id,
            long style = 0,
            const wxString& name = wxPanelNameStr)
   {
@@ -34,7 +34,7 @@ class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric
   ~wxStatusBarMac();
 
   bool Create(wxWindow *parent, wxWindowID id,
-              long style,
+              long style ,
               const wxString& name = wxPanelNameStr) ;
 
   virtual void DrawFieldText(wxDC& dc, int i);

include/wx/mac/uma.h

@@ -16,6 +16,11 @@
 
 #define UMA_USE_8_6 0 
 
+#if TARGET_CARBON
+#undef UMA_USE_8_6
+#define UMA_USE_8_6 1 
+#endif
+
 #if defined(__POWERPC__) || defined(__MACH__)
 #define UMA_USE_APPEARANCE 1
 #define UMA_USE_WINDOWMGR 1
@@ -35,6 +40,7 @@
 #endif
 
 void UMAInitToolbox( UInt16 inMoreMastersCalls) ;
+void UMACleanupToolbox() ;
 bool UMAHasAppearance() ;
 long UMAGetAppearanceVersion() ;
 
@@ -69,8 +75,8 @@ void			UMADrawMenuBar() ;
 void			UMAShowWatchCursor() ;
 void			UMAShowArrowCursor() ;
 
-void			UMAPrOpen() ;
-void			UMAPrClose() ;
+OSStatus		UMAPrOpen() ;
+OSStatus		UMAPrClose() ;
 
 // window manager
 

include/wx/mac/wave.h

@@ -28,14 +28,17 @@ public:
 
 public:
   bool  Create(const wxString& fileName, bool isResource = FALSE);
-  bool  IsOk() const { return (m_waveData ? TRUE : FALSE); };
+  bool  IsOk() const { return !m_sndname.IsEmpty(); }
   bool  Play(bool async = TRUE, bool looped = FALSE) const;
 
 protected:
   bool  Free();
 
 private:
-  char* m_waveData;
+  SndChannelPtr m_sndChan;
+	
+  wxString m_sndname;
+  SndListHandle m_hSnd;
   int   m_waveLength;
   bool  m_isResource;
 };

include/wx/mac/window.h

@@ -246,7 +246,12 @@ public :
 	WindowRef							GetMacRootWindow() const  ;
 
 	virtual ControlHandle 				MacGetContainerForEmbedding() ;
-	virtual long						MacGetBorderSize() const ;
+	
+	virtual long						MacGetLeftBorderSize() const ;
+	virtual long						MacGetRightBorderSize() const ;
+	virtual long						MacGetTopBorderSize() const ;
+	virtual long						MacGetBottomBorderSize() const ;
+
 	static long							MacRemoveBordersFromStyle( long style ) ;
 	virtual void 						MacSuperChangedPosition() ;
 	virtual void						MacSuperShown( bool show ) ;