Automatic merge from PDK_3.0.h CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 13:11:52 +0000
branchCompilerCompatibility
changeset 10 572d2052ec40
parent 8 b802b04b6cfa (current diff)
parent 7 c2c0f97004fc (diff)
child 12 e3debc045864
Automatic merge from PDK_3.0.h
--- a/mulwidgets/alfcontainerwidget/src/200100fe.rss	Mon Mar 08 21:44:06 2010 +0000
+++ b/mulwidgets/alfcontainerwidget/src/200100fe.rss	Sun Mar 14 13:11:52 2010 +0000
@@ -40,4 +40,4 @@
             };
         }
     };
-}
\ No newline at end of file
+}
--- a/mulwidgets/alfscrollbarwidget/src/20010105.rss	Mon Mar 08 21:44:06 2010 +0000
+++ b/mulwidgets/alfscrollbarwidget/src/20010105.rss	Sun Mar 14 13:11:52 2010 +0000
@@ -40,4 +40,4 @@
             };
         }
     };
-}
\ No newline at end of file
+}
--- a/mulwidgets/alfviewwidget/src/20010103.rss	Mon Mar 08 21:44:06 2010 +0000
+++ b/mulwidgets/alfviewwidget/src/20010103.rss	Sun Mar 14 13:11:52 2010 +0000
@@ -44,4 +44,4 @@
             };
         }
     };
-}
\ No newline at end of file
+}
--- a/mulwidgets/alfviewwidget/src/alfviewwidget.cpp	Mon Mar 08 21:44:06 2010 +0000
+++ b/mulwidgets/alfviewwidget/src/alfviewwidget.cpp	Sun Mar 14 13:11:52 2010 +0000
@@ -337,7 +337,6 @@
         // Update control pane, status pane and background according to state of the view.
         updateStatusPane();
         updateControlPane();
-        updateBackGroundImage();
         // When a view is activated, it sets the size of the display to full screen
         // This is done so that the view widget gets pointer events in the entire screen
         TRect screenRect(TPoint(0,0), TSize(AlfUtil::ScreenSize()));
@@ -440,7 +439,6 @@
 	    if(getViewStackPosition() == 0)
 	        {
 	        updateStatusPane();
-            updateBackGroundImage();
 	        }
 		}
     }
@@ -455,7 +453,6 @@
 	    if(getViewStackPosition() == 0)
 	        {        
             updateControlPane();
-            updateBackGroundImage();
 	        }
         }
     }
@@ -675,7 +672,6 @@
 
               // SetVisibleArea() only have an effect if the application is on foreground!
               control()->Env().PrimaryDisplay().SetVisibleArea(screenRect);
-              updateBackGroundImage(); 
               }
        
         }
@@ -689,7 +685,6 @@
             
             control()->Env().PrimaryDisplay().SetVisibleArea(screenRect);
             
-            updateBackGroundImage(); 
         
         } 
 
@@ -733,7 +728,6 @@
     	// the display area is required to be full screen, for the pointer grab to work
     	// check here whether the display area is full screen. If not, set it to full screen
         control()->Env().PrimaryDisplay().SetVisibleArea(screenRect);
-        updateBackGroundImage(); 
         }
     }
 
--- a/mulwidgets/mulcoverflowwidget/src/2000D240.rss	Mon Mar 08 21:44:06 2010 +0000
+++ b/mulwidgets/mulcoverflowwidget/src/2000D240.rss	Sun Mar 14 13:11:52 2010 +0000
@@ -41,4 +41,4 @@
             };
         }
     };
-}
\ No newline at end of file
+}
--- a/mulwidgets/mulsliderwidget/src/2000FA7F.rss	Mon Mar 08 21:44:06 2010 +0000
+++ b/mulwidgets/mulsliderwidget/src/2000FA7F.rss	Sun Mar 14 13:11:52 2010 +0000
@@ -40,4 +40,4 @@
             };
         }
     };
-}
\ No newline at end of file
+}
--- a/widgetmodel/alfwidgetfactory/src/10282329.rss	Mon Mar 08 21:44:06 2010 +0000
+++ b/widgetmodel/alfwidgetfactory/src/10282329.rss	Sun Mar 14 13:11:52 2010 +0000
@@ -38,4 +38,4 @@
             };
         }
     };
-}
\ No newline at end of file
+}