# HG changeset patch
# User Frank Benoit
# Date 1215112833 -7200
# Node ID edcf78db872273df262efbf83c84aa7bd55bc721
# Parent 71a9cd1cf2e903ca23f8c49394a157c21f9ae296
fix compile errors for SWT 3.4
diff -r 71a9cd1cf2e9 -r edcf78db8722 dwt/graphics/TextLayout.d
--- a/dwt/graphics/TextLayout.d Thu Jul 03 21:18:53 2008 +0200
+++ b/dwt/graphics/TextLayout.d Thu Jul 03 21:20:33 2008 +0200
@@ -12,6 +12,8 @@
*******************************************************************************/
module dwt.graphics.TextLayout;
+import dwt.dwthelper.utils;
+
import dwt.internal.Compatibility;
import dwt.internal.cairo.Cairo;
import dwt.internal.gtk.OS;
@@ -52,7 +54,7 @@
* @see TextLayout, TextStyle snippets
* @see DWT Example: CustomControlExample, StyledText tab
* @see Sample code and further information
- *
+ *
* @since 3.0
*/
public final class TextLayout : Resource {
@@ -217,7 +219,7 @@
byteStart = Math.min(byteStart, slen);
byteEnd = Math.min(byteEnd, slen);
Font font = style.font;
- if (font !is null && !font.isDisposed() && !defaultFont.equals(font)) {
+ if (font !is null && !font.isDisposed() && !defaultFont.opEquals(font)) {
auto attr = OS.pango_attr_font_desc_new (font.handle);
attr.start_index = byteStart;
attr.end_index = byteEnd;
@@ -898,7 +900,7 @@
* @exception DWTException
* - ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed
*
- *
+ *
* @see #setWidth(int)
* @see #getLineBounds(int)
*/
diff -r 71a9cd1cf2e9 -r edcf78db8722 dwt/widgets/IME.d
--- a/dwt/widgets/IME.d Thu Jul 03 21:18:53 2008 +0200
+++ b/dwt/widgets/IME.d Thu Jul 03 21:20:33 2008 +0200
@@ -10,6 +10,7 @@
*******************************************************************************/
module dwt.widgets.IME;
+import dwt.dwthelper.utils;
import dwt.DWT;
import dwt.DWTException;
@@ -27,7 +28,7 @@
* These are typically in-line pre-edit text areas that allow
* the user to compose characters from Far Eastern languages
* such as Japanese, Chinese or Korean.
- *
+ *
*
* - Styles:
* - (none)
@@ -37,9 +38,9 @@
*
* IMPORTANT: This class is not intended to be subclassed.
*
- *
+ *
* @see Sample code and further information
- *
+ *
* @since 3.4
*/
public class IME : Widget {
@@ -64,7 +65,7 @@
*
* The style value is either one of the style constants defined in
* class DWT
which is applicable to instances of this
- * class, or must be built by bitwise OR'ing together
+ * class, or must be built by bitwise OR'ing together
* (that is, using the int
"|" operator) two or more
* of those DWT
style constants. The class description
* lists the style constants that are applicable to the class.
@@ -120,14 +121,14 @@
* number of characters that have been composed. When the
* commit count is equal to the length of the composition
* text, then the in-line edit operation is complete.
- *
+ *
* @return the commit count
*
* @exception DWTException
* - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
* - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
*
- *
+ *
* @see IME#getText
*/
public int getCommitCount () {
@@ -168,7 +169,7 @@
*
ERROR_WIDGET_DISPOSED - if the receiver has been disposed
* ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
*
- *
+ *
* @see IME#getStyles
*/
public int [] getRanges () {
@@ -189,14 +190,14 @@
* that starts at ranges[n] and ends at ranges[n+1] uses the style
* at styles[n/2].
*
- *
+ *
* @return the ranges for the styles
*
* @exception DWTException
* - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
* - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
*
- *
+ *
* @see IME#getRanges
*/
public TextStyle [] getStyles () {
@@ -233,7 +234,7 @@
* false
otherwise. In some languages, for example
* Korean, the caret is typically widened to the width of the
* current character in the in-line edit session.
- *
+ *
* @return the wide caret state
*
* @exception DWTException