tomboy r2226 - in trunk: . Tomboy Tomboy/Addins/Backlinks Tomboy/Addins/Bugzilla Tomboy/Addins/ExportToHtml Tomboy/Addins/FileSystemSyncService Tomboy/Addins/FixedWidth Tomboy/Addins/InsertTimestamp Tomboy/Addins/NoteOfTheDay

From: sharm svn gnome org
To: svn-commits-list gnome org
Subject: tomboy r2226 - in trunk: . Tomboy Tomboy/Addins/Backlinks Tomboy/Addins/Bugzilla Tomboy/Addins/ExportToHtml Tomboy/Addins/FileSystemSyncService Tomboy/Addins/FixedWidth Tomboy/Addins/InsertTimestamp Tomboy/Addins/NoteOfTheDay
Date: Sat, 18 Oct 2008 13:26:34 +0000 (UTC)
Author: sharm
Date: Sat Oct 18 13:26:34 2008
New Revision: 2226
URL: http://svn.gnome.org/viewvc/tomboy?rev=2226&view=rev

Log:
* Tomboy/MacFactory.cs:
* Tomboy/Services.cs: Initial Mac support (for now, identical to Windows
support, but leaves out WindowsKeybinder).

* Tomboy.sln:
* Tomboy.csproj:
* Tomboy/Addins/*/*.csproj: Add new "Mac" configuration (should rename
"Debug" to "Windows", probably.  Defines "MAC".

* Tomboy/NoteWindow.cs:
* Tomboy/Tomboy.cs:
* Tomboy/Tray.cs:
* Tomboy/Utiles.cs: Update #if statements to include MAC as necessary.

Added:
   trunk/Tomboy/MacFactory.cs   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/Tomboy.csproj
   trunk/Tomboy.sln
   trunk/Tomboy/Addins/Backlinks/Backlinks.csproj
   trunk/Tomboy/Addins/Bugzilla/Bugzilla.csproj
   trunk/Tomboy/Addins/ExportToHtml/ExportToHtml.csproj
   trunk/Tomboy/Addins/FileSystemSyncService/FileSystemSyncService.csproj
   trunk/Tomboy/Addins/FixedWidth/FixedWidth.csproj
   trunk/Tomboy/Addins/InsertTimestamp/InsertTimestamp.csproj
   trunk/Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.csproj
   trunk/Tomboy/NoteWindow.cs
   trunk/Tomboy/Services.cs
   trunk/Tomboy/Tomboy.cs
   trunk/Tomboy/Tray.cs
   trunk/Tomboy/Utils.cs

Modified: trunk/Tomboy.csproj
==============================================================================
--- trunk/Tomboy.csproj	(original)
+++ trunk/Tomboy.csproj	Sat Oct 18 13:26:34 2008
@@ -61,6 +61,16 @@
       <Build xmlns="" />
     </Build>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Mac|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Mac\</OutputPath>
+    <DefineConstants>MAC</DefineConstants>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <Optimize>true</Optimize>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="atk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
@@ -88,6 +98,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>winbin\Mono.Posix.dll</HintPath>
     </Reference>
+    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
@@ -101,6 +112,7 @@
     <Compile Include="Tomboy\Contrast.cs" />
     <Compile Include="Tomboy\Defines.WIN32.cs" />
     <Compile Include="Tomboy\Logger.cs" />
+    <Compile Include="Tomboy\MacFactory.cs" />
     <Compile Include="Tomboy\ManagedWinapi.EventDispatchingNativeWindow.cs" />
     <Compile Include="Tomboy\ManagedWinapi.Hotkey.cs">
       <SubType>Component</SubType>

Modified: trunk/Tomboy.sln
==============================================================================
--- trunk/Tomboy.sln	(original)
+++ trunk/Tomboy.sln	Sat Oct 18 13:26:34 2008
@@ -1,7 +1,6 @@
 ï
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-# SharpDevelop 3.0.0.2970
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tomboy", "Tomboy.csproj", "{315DBB30-1461-4A41-A23F-A888D84E1EA0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FixedWidth", "Tomboy\Addins\FixedWidth\FixedWidth.csproj", "{30A75F9A-7305-465E-8754-334345424569}"
@@ -23,45 +22,63 @@
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Mac|Any CPU = Mac|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{315DBB30-1461-4A41-A23F-A888D84E1EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{315DBB30-1461-4A41-A23F-A888D84E1EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{315DBB30-1461-4A41-A23F-A888D84E1EA0}.Mac|Any CPU.ActiveCfg = Mac|Any CPU
+		{315DBB30-1461-4A41-A23F-A888D84E1EA0}.Mac|Any CPU.Build.0 = Mac|Any CPU
 		{315DBB30-1461-4A41-A23F-A888D84E1EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{315DBB30-1461-4A41-A23F-A888D84E1EA0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{30A75F9A-7305-465E-8754-334345424569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{30A75F9A-7305-465E-8754-334345424569}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30A75F9A-7305-465E-8754-334345424569}.Mac|Any CPU.ActiveCfg = Mac|Any CPU
+		{30A75F9A-7305-465E-8754-334345424569}.Mac|Any CPU.Build.0 = Mac|Any CPU
 		{30A75F9A-7305-465E-8754-334345424569}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{30A75F9A-7305-465E-8754-334345424569}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3D330B80-87BA-435E-B3B8-E3C796FB155C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D330B80-87BA-435E-B3B8-E3C796FB155C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D330B80-87BA-435E-B3B8-E3C796FB155C}.Mac|Any CPU.ActiveCfg = Mac|Any CPU
+		{3D330B80-87BA-435E-B3B8-E3C796FB155C}.Mac|Any CPU.Build.0 = Mac|Any CPU
 		{3D330B80-87BA-435E-B3B8-E3C796FB155C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D330B80-87BA-435E-B3B8-E3C796FB155C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8543F6E2-9B1C-4BFF-B2CC-DD0198E921CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8543F6E2-9B1C-4BFF-B2CC-DD0198E921CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8543F6E2-9B1C-4BFF-B2CC-DD0198E921CC}.Mac|Any CPU.ActiveCfg = Mac|Any CPU
+		{8543F6E2-9B1C-4BFF-B2CC-DD0198E921CC}.Mac|Any CPU.Build.0 = Mac|Any CPU
 		{8543F6E2-9B1C-4BFF-B2CC-DD0198E921CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8543F6E2-9B1C-4BFF-B2CC-DD0198E921CC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{88AB220D-4FB4-4875-8865-25CB6DF55EF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{88AB220D-4FB4-4875-8865-25CB6DF55EF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88AB220D-4FB4-4875-8865-25CB6DF55EF8}.Mac|Any CPU.ActiveCfg = Mac|Any CPU
+		{88AB220D-4FB4-4875-8865-25CB6DF55EF8}.Mac|Any CPU.Build.0 = Mac|Any CPU
 		{88AB220D-4FB4-4875-8865-25CB6DF55EF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{88AB220D-4FB4-4875-8865-25CB6DF55EF8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{31C73629-6979-41ED-8278-A291CB12DADF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{31C73629-6979-41ED-8278-A291CB12DADF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31C73629-6979-41ED-8278-A291CB12DADF}.Mac|Any CPU.ActiveCfg = Mac|Any CPU
+		{31C73629-6979-41ED-8278-A291CB12DADF}.Mac|Any CPU.Build.0 = Mac|Any CPU
 		{31C73629-6979-41ED-8278-A291CB12DADF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31C73629-6979-41ED-8278-A291CB12DADF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F2F2E123-EA8C-4753-9383-4C86B152F4FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F2F2E123-EA8C-4753-9383-4C86B152F4FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2F2E123-EA8C-4753-9383-4C86B152F4FE}.Mac|Any CPU.ActiveCfg = Mac|Any CPU
+		{F2F2E123-EA8C-4753-9383-4C86B152F4FE}.Mac|Any CPU.Build.0 = Mac|Any CPU
 		{F2F2E123-EA8C-4753-9383-4C86B152F4FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F2F2E123-EA8C-4753-9383-4C86B152F4FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33026B26-C907-4DBB-A438-85F042578AEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{33026B26-C907-4DBB-A438-85F042578AEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33026B26-C907-4DBB-A438-85F042578AEA}.Mac|Any CPU.ActiveCfg = Mac|Any CPU
+		{33026B26-C907-4DBB-A438-85F042578AEA}.Mac|Any CPU.Build.0 = Mac|Any CPU
 		{33026B26-C907-4DBB-A438-85F042578AEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{33026B26-C907-4DBB-A438-85F042578AEA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70C6BF8A-5AFF-4EF0-8D94-77F3281B8EE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70C6BF8A-5AFF-4EF0-8D94-77F3281B8EE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70C6BF8A-5AFF-4EF0-8D94-77F3281B8EE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70C6BF8A-5AFF-4EF0-8D94-77F3281B8EE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70C6BF8A-5AFF-4EF0-8D94-77F3281B8EE2}.Mac|Any CPU.ActiveCfg = Release|Any CPU
 		{70C6BF8A-5AFF-4EF0-8D94-77F3281B8EE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70C6BF8A-5AFF-4EF0-8D94-77F3281B8EE2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/Tomboy/Addins/Backlinks/Backlinks.csproj
==============================================================================
--- trunk/Tomboy/Addins/Backlinks/Backlinks.csproj	(original)
+++ trunk/Tomboy/Addins/Backlinks/Backlinks.csproj	Sat Oct 18 13:26:34 2008
@@ -42,6 +42,14 @@
     <BaseAddress>4194304</BaseAddress>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Mac|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Mac\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>Full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>

Modified: trunk/Tomboy/Addins/Bugzilla/Bugzilla.csproj
==============================================================================
--- trunk/Tomboy/Addins/Bugzilla/Bugzilla.csproj	(original)
+++ trunk/Tomboy/Addins/Bugzilla/Bugzilla.csproj	Sat Oct 18 13:26:34 2008
@@ -42,6 +42,14 @@
     <BaseAddress>4194304</BaseAddress>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Mac|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Mac\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>Full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>

Modified: trunk/Tomboy/Addins/ExportToHtml/ExportToHtml.csproj
==============================================================================
--- trunk/Tomboy/Addins/ExportToHtml/ExportToHtml.csproj	(original)
+++ trunk/Tomboy/Addins/ExportToHtml/ExportToHtml.csproj	Sat Oct 18 13:26:34 2008
@@ -42,6 +42,14 @@
     <BaseAddress>4194304</BaseAddress>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Mac|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Mac\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>Full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>

Modified: trunk/Tomboy/Addins/FileSystemSyncService/FileSystemSyncService.csproj
==============================================================================
--- trunk/Tomboy/Addins/FileSystemSyncService/FileSystemSyncService.csproj	(original)
+++ trunk/Tomboy/Addins/FileSystemSyncService/FileSystemSyncService.csproj	Sat Oct 18 13:26:34 2008
@@ -42,6 +42,14 @@
     <BaseAddress>4194304</BaseAddress>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Mac|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Mac\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>Full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>

Modified: trunk/Tomboy/Addins/FixedWidth/FixedWidth.csproj
==============================================================================
--- trunk/Tomboy/Addins/FixedWidth/FixedWidth.csproj	(original)
+++ trunk/Tomboy/Addins/FixedWidth/FixedWidth.csproj	Sat Oct 18 13:26:34 2008
@@ -42,6 +42,14 @@
     <BaseAddress>4194304</BaseAddress>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Mac|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Mac\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>Full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>

Modified: trunk/Tomboy/Addins/InsertTimestamp/InsertTimestamp.csproj
==============================================================================
--- trunk/Tomboy/Addins/InsertTimestamp/InsertTimestamp.csproj	(original)
+++ trunk/Tomboy/Addins/InsertTimestamp/InsertTimestamp.csproj	Sat Oct 18 13:26:34 2008
@@ -42,6 +42,14 @@
     <BaseAddress>4194304</BaseAddress>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Mac|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Mac\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>Full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>

Modified: trunk/Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.csproj
==============================================================================
--- trunk/Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.csproj	(original)
+++ trunk/Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.csproj	Sat Oct 18 13:26:34 2008
@@ -42,6 +42,14 @@
     <BaseAddress>4194304</BaseAddress>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Mac|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Mac\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>Full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>

Added: trunk/Tomboy/MacFactory.cs
==============================================================================
--- (empty file)
+++ trunk/Tomboy/MacFactory.cs	Sat Oct 18 13:26:34 2008
@@ -0,0 +1,31 @@
+ïnamespace Tomboy
+{
+	public class MacFactory : IPlatformFactory
+	{
+		public IPropertyEditor CreatePropertyEditorEntry (string key, Gtk.Entry sourceEntry)
+		{
+			return new PropertyEditorEntry (key, sourceEntry);
+		}
+
+		public IPropertyEditorBool CreatePropertyEditorToggleButton (
+			string key, Gtk.CheckButton sourceButton)
+		{
+			return new PropertyEditorToggleButton (key, sourceButton);
+		}
+
+		public IPreferencesClient CreatePreferencesClient ()
+		{
+			return new XmlPreferencesClient ();
+		}
+
+		public INativeApplication CreateNativeApplication ()
+		{
+			return new WindowsApplication ();
+		}
+
+		public IKeybinder CreateKeybinder ()
+		{
+			return new NullKeybinder ();
+		}
+	}
+}
\ No newline at end of file

Modified: trunk/Tomboy/NoteWindow.cs
==============================================================================
--- trunk/Tomboy/NoteWindow.cs	(original)
+++ trunk/Tomboy/NoteWindow.cs	Sat Oct 18 13:26:34 2008
@@ -242,7 +242,7 @@
 
 		void CloseAllWindowsHandler (object sender, EventArgs args)
 		{
-#if WIN32
+#if WIN32 || MAC
 			Tomboy.Exit (0);
 #else
 			int workspace = tomboy_window_get_workspace (note.Window.Handle);

Modified: trunk/Tomboy/Services.cs
==============================================================================
--- trunk/Tomboy/Services.cs	(original)
+++ trunk/Tomboy/Services.cs	Sat Oct 18 13:26:34 2008
@@ -39,6 +39,8 @@
 		{
 #if WIN32
 			factory = new WindowsFactory ();
+#elif MAC
+			factory = new MacFactory ();
 #else
 			factory = new GnomeFactory ();
 #endif

Modified: trunk/Tomboy/Tomboy.cs
==============================================================================
--- trunk/Tomboy/Tomboy.cs	(original)
+++ trunk/Tomboy/Tomboy.cs	Sat Oct 18 13:26:34 2008
@@ -6,7 +6,7 @@
 
 #if FIXED_PANELAPPLET
 using Gnome;
-#elif !WIN32
+#elif !WIN32 && !MAC
 using _Gnome;
 #endif
 
@@ -111,7 +111,7 @@
 		static void RegisterPanelAppletFactory ()
 		{
 			// This will block if there is no existing instance running
-#if !WIN32
+#if !WIN32 && !MAC
 			PanelAppletFactory.Register (typeof (TomboyApplet));
 #endif
 		}
@@ -249,7 +249,7 @@
 		{
 			Gdk.Screen screen = null;
 			if (tray_icon != null) {
-#if WIN32
+#if WIN32 || MAC
 				screen = tray_icon.Tray.TomboyTrayMenu.Screen;
 #else
 				Gdk.Rectangle area;

Modified: trunk/Tomboy/Tray.cs
==============================================================================
--- trunk/Tomboy/Tray.cs	(original)
+++ trunk/Tomboy/Tray.cs	Sat Oct 18 13:26:34 2008
@@ -195,7 +195,7 @@
 			Gdk.Rectangle area;
 			Gtk.Orientation orientation;
 			try {
-#if WIN32
+#if WIN32 || MAC
 				menu.Screen.Display.GetPointer (out x, out y);
 				screen = menu.Screen;
 				area.Height = 0;
@@ -278,7 +278,7 @@
 
 			Gdk.Rectangle area;
 			Gtk.Orientation orientation;
-#if WIN32
+#if WIN32 || MAC
 			int x;
 			tray.TomboyTrayMenu.Screen.Display.GetPointer (out x, out val);
 			screen = tray.TomboyTrayMenu.Screen;

Modified: trunk/Tomboy/Utils.cs
==============================================================================
--- trunk/Tomboy/Utils.cs	(original)
+++ trunk/Tomboy/Utils.cs	Sat Oct 18 13:26:34 2008
@@ -786,7 +786,7 @@
 : base (name)
 		{
 		}
-#if !WIN32
+#if !WIN32 && !MAC
 		[DllImport("libtomboy")]
 		static extern void tomboy_window_present_hardcore (IntPtr win);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]