--- a/javauis/eswt_akn/eswtapifacade/src/swtlaffacade.cpp	Mon May 03 12:27:20 2010 +0300
+++ b/javauis/eswt_akn/eswtapifacade/src/swtlaffacade.cpp	Fri May 14 15:47:24 2010 +0300
@@ -377,9 +377,16 @@
         layoutRect.LayoutRect(aRect, AknLayoutScalable_Avkon::
                               list_single_popup_submenu_pane(0).LayoutLine());
         break;
+
     case EPopupEswtTasktipWindow:
+#ifdef RD_JAVA_S60_RELEASE_9_2
+        layoutRect.LayoutRect(aRect, AknLayoutScalable_Avkon::
+                              popup_discreet_window(aArg1).LayoutLine());
+#else
         layoutRect.LayoutRect(aRect, AknLayoutScalable_Avkon::
                               popup_eswt_tasktip_window(aArg1).LayoutLine());
+#endif
+
         break;
     case EWaitBarPaneCp71:
         layoutRect.LayoutRect(aRect, AknLayoutScalable_Avkon::
@@ -576,10 +583,6 @@
         layoutText.LayoutText(aRect, AknLayout::
                               Form_data_wide_graphic_field_texts_Line_2(aArg1));
         break;
-    case EPopupEswtTasktipWindowT1:
-        layoutText.LayoutText(aRect, AknLayoutScalable_Avkon::
-                              popup_eswt_tasktip_window_t1(aArg1).LayoutLine());
-        break;
     case ETabs4ActivePaneT1:
         layoutText.LayoutText(aRect, AknLayoutScalable_Avkon::
                               tabs_4_active_pane_t1(aArg1).LayoutLine());