From b6098dba5820a76eab4229f029865f4ad22c9481 Mon Sep 17 00:00:00 2001
From: macpgmr <macpgmr@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 30 Jun 2007 18:40:18 +0000
Subject: [PATCH] Release 0.1.5: Most Orph controls now work with latest Carbon
 widgetset.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@201 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/orpheus/OrphStatus.html | 36 +++++++++++++++++-------------
 components/orpheus/mymisc.pas      | 12 +++++-----
 components/orpheus/orpheus.lpk     |  2 +-
 components/orpheus/ovcrlbl.pas     |  6 +++++
 components/orpheus/ovctable.pas    |  4 +++-
 5 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/components/orpheus/OrphStatus.html b/components/orpheus/OrphStatus.html
index a12aa7eac..55150985d 100644
--- a/components/orpheus/OrphStatus.html
+++ b/components/orpheus/OrphStatus.html
@@ -33,6 +33,10 @@
 <A name="Whats_New"></A><H3>What's New</H3>
 
 <UL>
+<LI>20070630 release (0.1.5):
+  <UL>
+  <LI>Most of the Orpheus controls now work with the Lazarus Carbon widgetset.<P>
+  </UL>
 <LI>20070425 release (0.1.4):
   <UL>
   <LI>Recent changes to Lazarus LCL broke compilation of Orpheus. This
@@ -170,15 +174,15 @@ access to the Lazarus install folder. After rebuilding, be sure to start
 <TD>XP SP2</TD>
 <TD>&nbsp;</TD>
 <TD>win32</TD>
-<TD>20070615 snapshot of 0.9.23 with FPC 2.1.5</TD>
+<TD>20070630 snapshot of 0.9.23 with FPC 2.1.5</TD>
 </TR>
 
 <TR VALIGN=TOP>
 <TD>OS X</TD>
-<TD>10.4.9 (Tiger) on PowerPC</TD>
+<TD>10.4.10 (Tiger) on PowerPC</TD>
 <TD>gtk: 1.2.0.9.1<BR>gtk2: 2.6.10<BR>qt: 4.3.0</TD>
 <TD>gtk, gtk2, carbon, qt</TD>
-<TD>20070615 snapshot of 0.9.23 with FPC 2.0.4</TD>
+<TD>20070630 snapshot of 0.9.23 with FPC 2.0.4</TD>
 </TR>
 
 <TR VALIGN=TOP>
@@ -321,11 +325,11 @@ widgetsets.
 <TD>TOvcRotatedLabel<BR><IMG SRC="TOVCROTATEDLABEL.bmp"></TD>
 <TD>TGraphicControl</TD>
 <TD>Rotated text</TD>
-<TD>gtk and carbon don't support</TD>
+<TD>gtk widgetset doesn't support</TD>
 <TD>Working</TD>
 <TD>Not working</TD>
 <TD>Crashes</TD>
-<TD>Not working</TD>
+<TD>Working</TD>
 <TD>Working</TD>
 </TR>
 
@@ -361,7 +365,7 @@ widgetsets.
 <TD>Working</TD>
 <TD>Working</TD>
 <TD>Working</TD>
-<TD>Crashes</TD>
+<TD>Working</TD>
 <TD>Crashes</TD>
 </TR>
 
@@ -409,7 +413,7 @@ widgetsets.
 <TD>Working</TD>
 <TD>Working</TD>
 <TD>Working</TD>
-<TD>Not working</TD>
+<TD>Partial</TD>
 <TD>Crashes</TD>
 </TR>
 
@@ -421,7 +425,7 @@ widgetsets.
 <TD>Working</TD>
 <TD>Working</TD>
 <TD>Working</TD>
-<TD>?</TD>
+<TD>Working</TD>
 <TD>?</TD>
 </TR>
 
@@ -433,7 +437,7 @@ widgetsets.
 <TD>Working</TD>
 <TD>Working</TD>
 <TD>Working</TD>
-<TD>?</TD>
+<TD>Working</TD>
 <TD>?</TD>
 </TR>
 
@@ -445,7 +449,7 @@ widgetsets.
 <TD>Working</TD>
 <TD>Working</TD>
 <TD>Working</TD>
-<TD>?</TD>
+<TD>Working</TD>
 <TD>?</TD>
 </TR>
 
@@ -457,7 +461,7 @@ widgetsets.
 <TD>Working</TD>
 <TD>Crashes</TD>
 <TD>Crashes</TD>
-<TD>?</TD>
+<TD>Not working</TD>
 <TD>?</TD>
 </TR>
 
@@ -469,7 +473,7 @@ widgetsets.
 <TD>Working</TD>
 <TD>Working</TD>
 <TD>Working</TD>
-<TD>?</TD>
+<TD>Working</TD>
 <TD>?</TD>
 </TR>
 
@@ -481,7 +485,7 @@ widgetsets.
 <TD>Working</TD>
 <TD>Working</TD>
 <TD>Working</TD>
-<TD>?</TD>
+<TD>Working</TD>
 <TD>?</TD>
 </TR>
 
@@ -493,7 +497,7 @@ widgetsets.
 <TD>Working</TD>
 <TD>Working</TD>
 <TD>Working</TD>
-<TD>?</TD>
+<TD>Working</TD>
 <TD>?</TD>
 </TR>
 
@@ -505,7 +509,7 @@ widgetsets.
 <TD>Working</TD>
 <TD>Working</TD>
 <TD>Working</TD>
-<TD>?</TD>
+<TD>Not working</TD>
 <TD>?</TD>
 </TR>
 
@@ -638,7 +642,7 @@ OS X tips for Lazarus:<P>
 
 <P>
 <HR>
-Last updated: June 16, 2007
+Last updated: June 30, 2007
 <P>
 
 </BODY>
diff --git a/components/orpheus/mymisc.pas b/components/orpheus/mymisc.pas
index e9aae8c9c..48ba6867f 100644
--- a/components/orpheus/mymisc.pas
+++ b/components/orpheus/mymisc.pas
@@ -288,10 +288,10 @@ function GlobalAlloc(uFlags: UINT; dwBytes: DWORD): HGLOBAL;
 function GlobalLock(hMem: HGLOBAL): Pointer;
 function GlobalUnlock(hMem: HGLOBAL): BOOL;
 //function DestroyCursor(hCursor: HICON): BOOL;
-{$IFDEF MSWINDOWS}  //Shouldn't be needed with GTK widgetset.
+//{$IFDEF MSWINDOWS}  //Not needed with GTK and Qt (but doesn't hurt); Win32 and Carbon need it.
 function PostMessage(hWnd: HWND; Msg: UINT; wParam: WPARAM; lParam: LPARAM): BOOL;
 function SendMessage(hWnd: HWND; Msg: UINT; wParam: WPARAM; lParam: LPARAM): LRESULT;
-{$ENDIF}
+//{$ENDIF}
 procedure RecreateWnd(const AWinControl:TWinControl);
 
  {These belong in Classes unit}
@@ -780,11 +780,11 @@ end;
 
 
 function PostMessage(hWnd: HWND; Msg: UINT; wParam: WPARAM; lParam: LPARAM): BOOL;
- {Use control's Perform method to force it to respond to message}
+ {Use control's Perform method to force it to respond to posted message.
+  This doesn't work:  Result := LclIntf.PostMessage(hWnd, Msg, wParam, lParam); }
 var
   AWinControl : TWinControl;
 begin
-//  Result := LclIntf.PostMessage(hWnd, Msg, wParam, lParam);  {Doesn't work}
   Assert(hWnd <> 0, 'Window handle not assigned on entry to PostMessage');
   AWinControl := FindOwnerControl(hWnd);
 //  Assert(AWinControl <> nil, 
@@ -795,11 +795,11 @@ begin
 end;
 
 function SendMessage(hWnd: HWND; Msg: UINT; wParam: WPARAM; lParam: LPARAM): LRESULT;
- {Use control's Perform method to force it to respond to message}
+ {Use control's Perform method to force it to respond to sent message.
+  This doesn't work: Result := LclIntf.SendMessage(hWnd, Msg, wParam, lParam); }
 var
   AWinControl : TWinControl;
 begin
-//  Result := LclIntf.SendMessage(hWnd, Msg, wParam, lParam);  {Doesn't work}
   Assert(hWnd <> 0, 'Window handle not assigned on entry to SendMessage');
   AWinControl := FindOwnerControl(hWnd);
 //  Assert(AWinControl <> nil,
diff --git a/components/orpheus/orpheus.lpk b/components/orpheus/orpheus.lpk
index 98f421185..07ca99e21 100644
--- a/components/orpheus/orpheus.lpk
+++ b/components/orpheus/orpheus.lpk
@@ -31,7 +31,7 @@
 "/>
     <License Value="MPL 1.1
 "/>
-    <Version Minor="1" Release="4"/>
+    <Version Minor="1" Release="5"/>
     <Files Count="1">
       <Item1>
         <Filename Value="myovcreg.pas"/>
diff --git a/components/orpheus/ovcrlbl.pas b/components/orpheus/ovcrlbl.pas
index f82473d37..d95364bd5 100644
--- a/components/orpheus/ovcrlbl.pas
+++ b/components/orpheus/ovcrlbl.pas
@@ -209,7 +209,11 @@ begin
   FShadowColor    := clBtnShadow;
   FShadowedText   := False;
 
+{$IFDEF MSWINDOWS}
   Font.Name       := 'Arial';
+{$ELSE}
+  Font.Name       := 'default';
+{$ENDIF}
   Height          := 20;
   Width           := 130;
 
@@ -490,7 +494,9 @@ begin
         GetTextMetrics(Canvas.Handle, TM);
         if (TM.tmPitchAndFamily and TMPF_TRUETYPE) = 0 then
           {force true-type font}
+{$IFDEF MSWINDOWS}
           Font.Name := 'Arial';
+{$ENDIF}
       end;
     end;
     if Value < 0 then Neg := -1 else Neg := 1;
diff --git a/components/orpheus/ovctable.pas b/components/orpheus/ovctable.pas
index 42d20ef60..408490868 100644
--- a/components/orpheus/ovctable.pas
+++ b/components/orpheus/ovctable.pas
@@ -4494,7 +4494,9 @@ procedure TOvcCustomTable.tbDrawActiveCell;
      cell, otherwise, draw the focus box around the cell contents}
     if InEditingState then
       begin
-        UpdateWindow(tbActCell.EditHandle);
+{$IFDEF MSWINDOWS}
+        UpdateWindow(tbActCell.EditHandle);  //Not implemented on Gtk/Qt and recurses w/ Carbon
+{$ENDIF}
       end
     else
       begin