customdrawnws: Adds skeleton for android support and upgrades to use the compatibility routines from lazcanvas

git-svn-id: trunk@33761 -

.gitattributes

@@ -5420,6 +5420,7 @@ lcl/interfaces/customdrawn/alllclintfunits.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/cocoagdiobjects.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/cocoaprivate.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/cocoautils.pas svneol=native#text/pascal
+lcl/interfaces/customdrawn/customdrawn_androidproc.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawn_winproc.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawn_x11proc.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawndefines.inc svneol=native#text/pascal
@@ -5427,11 +5428,13 @@ lcl/interfaces/customdrawn/customdrawnint.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnlclintf.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnlclintfh.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnobject.inc svneol=native#text/pascal
+lcl/interfaces/customdrawn/customdrawnobject_android.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnobject_cocoa.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnobject_win.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnobject_x11.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnproc.pas svneol=native#text/plain
 lcl/interfaces/customdrawn/customdrawnwinapi.inc svneol=native#text/pascal
+lcl/interfaces/customdrawn/customdrawnwinapi_android.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnwinapi_cocoa.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnwinapi_win.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc svneol=native#text/pascal
@@ -5441,6 +5444,7 @@ lcl/interfaces/customdrawn/customdrawnwscontrols.pp svneol=native#text/plain
 lcl/interfaces/customdrawn/customdrawnwscontrols_win.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnwsfactory.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnwsforms.pp svneol=native#text/plain
+lcl/interfaces/customdrawn/customdrawnwsforms_android.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnwsforms_cocoa.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnwsforms_win.inc svneol=native#text/pascal
 lcl/interfaces/customdrawn/customdrawnwsforms_x11.inc svneol=native#text/pascal

lcl/interfaces/customdrawn/customdrawn_androidproc.pas

@@ -0,0 +1,31 @@
+unit customdrawn_androidproc;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  // rtl+ftl
+  Types, Classes, SysUtils,
+  fpimage, fpcanvas, ctypes,
+  // Custom Drawn Canvas
+  IntfGraphics, lazcanvas,
+  //
+  GraphType, Controls, LCLMessageGlue, WSControls, LCLType, LCLProc,
+  customdrawnproc;
+
+type
+  TAndroidWindowInfo = class
+  public
+//    Window: X.TWindow;
+    LCLControl: TWinControl;
+    Children: TFPList; // of TCDWinControl;
+    // painting objects
+    Image: TLazIntfImage;
+    Canvas: TLazCanvas;
+  end;
+
+implementation
+
+end.
+

lcl/interfaces/customdrawn/customdrawndefines.inc

@@ -14,7 +14,11 @@
     {$ifdef Darwin}
       {$define CD_Cocoa}
     {$else}
-      {$define CD_X11}
+      {$ifdef Android}
+        {$define CD_Android}
+      {$else}
+        {$define CD_X11}
+      {$endif}
     {$endif}
   {$endif}
 {$endif}

lcl/interfaces/customdrawn/customdrawnint.pas

@@ -34,6 +34,7 @@ uses
   {$ifdef CD_Windows}Windows, customdrawn_WinProc,{$endif}
   {$ifdef CD_Cocoa}MacOSAll, CocoaAll, CocoaPrivate,{$endif}
   {$ifdef CD_X11}X, XLib, XUtil, customdrawn_x11proc,{unitxft, Xft font support}{$endif}
+  {$ifdef CD_Android}customdrawn_androidproc,{$endif}
   // Widgetset
   customdrawnproc,
   // LCL
@@ -218,6 +219,10 @@ uses
   {$I customdrawnobject_x11.inc}
   {$I customdrawnwinapi_x11.inc}
 {$endif}
+{$ifdef CD_Android}
+  {$I customdrawnobject_android.inc}
+  {$I customdrawnwinapi_android.inc}
+{$endif}
 
 initialization
   SystemCharSetIsUTF8:=true;

lcl/interfaces/customdrawn/customdrawnobject_android.inc

@@ -0,0 +1,572 @@
+{%MainUnit customdrawnint.pas}
+
+{******************************************************************************
+                                   customdrawnobject_win.inc
+ ******************************************************************************
+
+ *****************************************************************************
+ *                                                                           *
+ *  This file is part of the Lazarus Component Library (LCL)                 *
+ *                                                                           *
+ *  See the file COPYING.modifiedLGPL.txt, included in this distribution,    *
+ *  for details about the copyright.                                         *
+ *                                                                           *
+ *  This program is distributed in the hope that it will be useful,          *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ *****************************************************************************
+}
+(*
+type
+  Psaved_state = ^Tsaved_state;
+  Tsaved_state = packed record
+    angle : cfloat;
+    x : cint32;
+    y : cint32;
+  end;
+
+  Pengine = ^Tengine;
+  Tengine = packed record
+    app : Pandroid_app;
+    animating : cint;
+    display : EGLDisplay;
+    surface : EGLSurface;
+    context : EGLContext;
+    width : cint32;
+    height : cint32;
+    state : Tsaved_state;
+  end;
+
+const
+ attribs: array[0..8] of EGLint = (
+           EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+           EGL_BLUE_SIZE, 8,
+           EGL_GREEN_SIZE, 8,
+           EGL_RED_SIZE, 8,
+           EGL_NONE);
+
+function engine_init_display(engine: Pengine): cint;
+var w, h, dummy, format,numConfigs: EGLint;
+    config: EGLConfig;
+    surface: EGLSurface;
+    context: EGLContext;
+    display: Pointer;
+begin
+   // initialize OpenGL ES and EGL
+
+   (*
+    * Here specify the attributes of the desired configuration.
+    * Below, we select an EGLConfig with at least 8 bits per color
+    * component compatible with on-screen windows
+     *)
+
+   display := eglGetDisplay(EGL_DEFAULT_DISPLAY);
+
+   eglInitialize(display, nil,nil);
+
+(* Here, the application chooses the configuration it desires. In this
+    * sample, we have a very simplified selection process, where we pick
+    * the first EGLConfig that matches our criteria  *)
+
+   eglChooseConfig(display, attribs, @config, 1, @numConfigs);
+
+(* EGL_NATIVE_VISUAL_ID is an attribute of the EGLConfig that is
+    * guaranteed to be accepted by ANativeWindow_setBuffersGeometry().
+    * As soon as we picked a EGLConfig, we can safely reconfigure the
+    * ANativeWindow buffers to match, using EGL_NATIVE_VISUAL_ID.  *)
+
+   eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, @format);
+
+   ANativeWindow_setBuffersGeometry(engine^.app^.window, 0, 0, format);
+
+   surface := eglCreateWindowSurface(display, config, engine^.app^.window, nil);
+   context := eglCreateContext(display, config, nil, nil);
+
+   if eglMakeCurrent(display, surface, surface, context) = EGL_FALSE then
+   begin
+       LOGW('Unable to eglMakeCurrent');
+       exit(-1);
+   end;
+
+   eglQuerySurface(display, surface, EGL_WIDTH, @w);
+   eglQuerySurface(display, surface, EGL_HEIGHT, @h);
+
+   engine^.display := display;
+   engine^.context := context;
+   engine^.surface := surface;
+   engine^.width := w;
+   engine^.height := h;
+   engine^.state.angle := 0;
+
+   // Initialize GL state.
+   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+   glEnable(GL_CULL_FACE);
+   glShadeModel(GL_SMOOTH);
+   glDisable(GL_DEPTH_TEST);
+
+   result := 0;
+end;
+
+procedure engine_draw_frame(engine: Pengine);
+begin
+   if engine^.display = nil then
+      exit;
+
+   // Just fill the screen with a color.
+   glClearColor(engine^.state.x/engine^.width, engine^.state.angle, engine^.state.y/engine^.height, 1);
+   glClear(GL_COLOR_BUFFER_BIT);
+
+   eglSwapBuffers(engine^.display, engine^.surface);
+end;
+
+
+procedure engine_term_display(engine: Pengine);
+begin
+   if (engine^.display <> EGL_NO_DISPLAY) then
+   begin
+       eglMakeCurrent(engine^.display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+       if (engine^.context <> EGL_NO_CONTEXT) then
+           eglDestroyContext(engine^.display, engine^.context);
+       if (engine^.surface <> EGL_NO_SURFACE) then
+           eglDestroySurface(engine^.display, engine^.surface);
+       eglTerminate(engine^.display);
+   end;
+
+   engine^.animating := 0;
+   engine^.display := EGL_NO_DISPLAY;
+   engine^.context := EGL_NO_CONTEXT;
+   engine^.surface := EGL_NO_SURFACE;
+end;
+
+procedure engine_handle_cmd(app: Pandroid_app; cmd: cint32); cdecl;
+var engine: Pengine;
+begin
+   engine := Pengine(app^.userData);
+   case cmd of
+      APP_CMD_SAVE_STATE:
+         begin
+            // The system has asked us to save our current state.  Do so.
+            engine^.app^.savedState := malloc(sizeof(Tsaved_state));
+            Psaved_state(engine^.app^.savedState)^ := engine^.state;
+            engine^.app^.savedStateSize := sizeof(Tsaved_state);
+         end;
+      APP_CMD_INIT_WINDOW:
+         begin
+            // The window is being shown, get it ready.
+            if (engine^.app^.window <> Nil) then
+            begin
+               LOGW('Initializing display');
+               engine_init_display(engine);
+               engine_draw_frame(engine);
+            end;
+         end;
+      APP_CMD_TERM_WINDOW:
+         begin
+            // The window is being hidden or closed, clean it up.
+            engine_term_display(engine);
+         end;
+      APP_CMD_GAINED_FOCUS:
+         begin
+            // When our app gains focus, we start monitoring the accelerometer.
+            {if (engine^.accelerometerSensor <> Nil) then
+            begin
+               ASensorEventQueue_enableSensor(engine^.sensorEventQueue, engine^.accelerometerSensor);
+               // We'd like to get 60 events per second (in us).
+               ASensorEventQueue_setEventRate(engine^.sensorEventQueue, engine^.accelerometerSensor, (1000L/60)*1000);
+            end;}
+         end;
+      APP_CMD_LOST_FOCUS:
+         begin
+            // When our app loses focus, we stop monitoring the accelerometer.
+            // This is to avoid consuming battery while not being used.
+            {if engine^.accelerometerSensor <> NULL then
+               ASensorEventQueue_disableSensor(engine^.sensorEventQueue, engine^.accelerometerSensor);}
+            // Also stop animating.
+            engine^.animating := 0;
+            engine_draw_frame(engine);
+         end;
+   end;
+end;
+
+function engine_handle_input(app: Pandroid_app; event: PAInputEvent): cint32; cdecl;
+var engine: Pengine;
+begin
+   engine := Pengine(app^.userData);
+   if AInputEvent_getType(event) = AINPUT_EVENT_TYPE_MOTION then
+   begin
+      engine^.animating := 1;
+      {engine^.state.x := AMotionEvent_getX(event, 0);
+      engine^.state.y := AMotionEvent_getY(event, 0);}
+      result := 1;
+   end
+   else
+      result := 0;
+end;       *)
+
+{------------------------------------------------------------------------------
+  Method: TCDWidgetSet.Create
+  Params:  None
+  Returns: Nothing
+
+  Constructor for the class.
+ ------------------------------------------------------------------------------}
+procedure TCDWidgetSet.BackendCreate;
+begin
+
+end;
+
+{------------------------------------------------------------------------------
+  Method: TWinCEWidgetSet.Destroy
+  Params:  None
+  Returns: Nothing
+
+  destructor for the class.
+ ------------------------------------------------------------------------------}
+procedure TCDWidgetSet.BackendDestroy;
+begin
+
+end;
+
+{------------------------------------------------------------------------------
+  Method: TWinCEWidgetSet.AppInit
+  Params:  None
+  Returns: Nothing
+
+  initialize Windows
+ ------------------------------------------------------------------------------}
+procedure TCDWidgetSet.AppInit(var ScreenInfo: TScreenInfo);
+{var engine: Tengine;
+    ident,events: cint;
+    source: Pandroid_poll_source;
+    val: cint;}
+begin
+   {$ifdef VerboseCDApplication}
+   //DebugLn('TCDWidgetSet.AppInit');
+   {$endif}
+{   // Make sure glue isn't stripped.
+   app_dummy();
+   LOGW('Android main!');
+
+   FillChar(engine, sizeof(Tengine), 0);
+   LOGW('Android main 2!');
+
+   state^.userData := @engine;
+   state^.onAppCmd := @engine_handle_cmd;
+   state^.onInputEvent := @engine_handle_input;
+   engine.app := state;
+   LOGW('Android main 3!');
+
+   if state^.savedState <> nil then
+      // We are starting with a previous saved state; restore from it.
+      engine.state := Psaved_state(state^.savedState)^;  }
+end;
+
+procedure TCDWidgetSet.AppRun(const ALoop: TApplicationMainLoop);
+{var engine: Tengine;
+    ident,events: cint;
+    source: Pandroid_poll_source;
+    val: cint;}
+begin
+  {$ifdef VerboseCDApplication}
+  DebugLn('TCDWidgetSet.AppRun');
+  {$endif}
+(*  LOGW('Entering loop');
+  // loop waiting for stuff to do.
+
+  while true do
+  begin// Read all pending events.
+  // If not animating, we will block forever waiting for events.
+  // If animating, we loop until all events are read, then continue
+  // to draw the next frame of animation.
+
+  if engine.animating<>0 then
+    val := 0
+  else
+    val := -1;
+  ident := ALooper_pollAll(val, nil, @events,@source);
+  while (ident >= 0) do
+  begin
+    // Process this event.
+    if (source <> nil) then
+       source^.process(state, source);
+
+    // If a sensor has data, process it now.
+    if (ident = LOOPER_ID_USER) then
+    begin
+       {if (engine.accelerometerSensor != nil) then
+       begin
+          ASensorEvent event;
+          while (ASensorEventQueue_getEvents(engine.sensorEventQueue, &event, 1) > 0) do
+          begin
+             LOGI("accelerometer: x=%f y=%f z=%f",
+                     [event.acceleration.x, event.acceleration.y,
+                     event.acceleration.z]);
+          end;
+       end;}
+    end;
+
+    // Check if we are exiting.
+    if (state^.destroyRequested <> 0) then
+    begin
+       LOGW('Destroy requested');
+       engine_term_display(@engine);
+       exit;
+    end;
+
+    if engine.animating<>0 then
+       val := 0
+    else
+       val := -1;
+    ident := ALooper_pollAll(val, nil, @events,@source);
+  end;
+
+  if engine.animating <> 0 then
+  begin
+    // Done with events; draw next animation frame.
+    engine.state.angle := engine.state.angle + 0.01;
+    if (engine.state.angle > 1) then
+       engine.state.angle := 0;
+  end;
+
+  // Drawing is throttled to the screen update rate, so there
+  // is no need to do timing here.
+  engine_draw_frame(@engine);*)
+end;
+
+(*
+function TWinCEWidgetSet.GetAppHandle: THandle;
+begin
+  Result:= FAppHandle;
+end;
+
+procedure TWinCEWidgetSet.SetAppHandle(const AValue: THandle);
+begin
+  // Do it only if handle is not yet created (for example for DLL initialization)
+  // if handle is already created we can't reassign it
+  if AppHandle = 0 then
+    FAppHandle := AValue;
+end;*)
+
+{------------------------------------------------------------------------------
+  Method: TWinCEWidgetSet.AppMinimize
+  Params:  None
+  Returns: Nothing
+
+  Minimizes the whole application to the taskbar
+ ------------------------------------------------------------------------------}
+procedure TCDWidgetSet.AppMinimize;
+begin
+//  Windows.SendMessage(FAppHandle, WM_SYSCOMMAND, SC_MINIMIZE, 0);
+end;
+
+{------------------------------------------------------------------------------
+  Method: TWinCEWidgetSet.AppRestore
+  Params:  None
+  Returns: Nothing
+
+  Restore minimized whole application from taskbar
+ ------------------------------------------------------------------------------}
+
+procedure TCDWidgetSet.AppRestore;
+begin
+//  Windows.SendMessage(FAppHandle, WM_SYSCOMMAND, SC_RESTORE, 0);
+end;
+
+
+{------------------------------------------------------------------------------
+  Method: TWinCEWidgetSet.AppBringToFront
+  Params:  None
+  Returns: Nothing
+
+  Brings the entire application on top of all other non-topmost programs
+ ------------------------------------------------------------------------------}
+procedure TCDWidgetSet.AppBringToFront;
+begin
+end;
+
+(*
+procedure TWinCEWidgetSet.SetDesigning(AComponent: TComponent);
+begin
+  //if Data<>nil then EnableWindow((AComponent As TWinControl).Handle, boolean(Data^));
+end;
+
+{------------------------------------------------------------------------------
+  Method: TWinCEWidgetSet.SetCallback
+  Params: Msg    - message for which to set a callback
+          Sender - object to which callback will be sent
+  Returns:  nothing
+
+  Applies a Message to the sender
+ ------------------------------------------------------------------------------}
+procedure TWinCEWidgetSet.SetCallback(Msg: LongInt; Sender: TObject);
+var
+  Window: HWnd;
+begin
+  //DebugLn('Trace:TWinCEWidgetSet.SetCallback - Start');
+  //DebugLn(Format('Trace:TWinCEWidgetSet.SetCallback - Class Name --> %S', [Sender.ClassName]));
+  //DebugLn(Format('Trace:TWinCEWidgetSet.SetCallback - Message Name --> %S', [GetMessageName(Msg)]));
+  if Sender Is TControlCanvas then
+    Window := TControlCanvas(Sender).Handle
+  else if Sender Is TCustomForm then
+    Window := TCustomForm(Sender).Handle
+  else
+    Window := TWinControl(Sender).Handle;
+  if Window=0 then exit;
+
+  //DebugLn('Trace:TWinCEWidgetSet.SetCallback - Exit');
+end;
+
+{------------------------------------------------------------------------------
+  Method: TWinCEWidgetSet.RemoveCallbacks
+  Params:   Sender - object from which to remove callbacks
+  Returns:  nothing
+
+  Removes Call Back Signals from the sender
+ ------------------------------------------------------------------------------}
+procedure TWinCEWidgetSet.RemoveCallbacks(Sender: TObject);
+var
+  Window: HWnd;
+begin
+  if Sender Is TControlCanvas then
+    Window := TControlCanvas(Sender).Handle
+  else if Sender Is TCustomForm then
+    Window := TCustomForm(Sender).Handle
+  else
+    Window := (Sender as TWinControl).Handle;
+  if Window=0 then exit;
+end;*)
+
+{------------------------------------------------------------------------------
+  Method: TWinCEWidgetSet.AppProcessMessages
+  Params:  None
+  Returns: Nothing
+
+  Handle all pending messages
+ ------------------------------------------------------------------------------}
+procedure TCDWidgetSet.AppProcessMessages;
+begin
+end;
+(*
+procedure TWinCEWidgetSet.CheckPipeEvents;
+var
+  lHandler: PPipeEventInfo;
+//  lBytesAvail: dword;
+//  SomethingChanged: Boolean;
+  ChangedCount:integer;
+begin
+  lHandler := FWaitPipeHandlers;
+  ChangedCount := 0;
+  while (lHandler <> nil) and (ChangedCount < 10) do
+  begin
+    {
+    roozbeh : ooops not supported
+    SomethingChanged:=true;
+    if Windows.PeekNamedPipe(lHandler^.Handle, nil, 0, nil, @lBytesAvail, nil) then
+    begin
+      if lBytesAvail <> 0 then
+        lHandler^.OnEvent(lHandler^.UserData, [prDataAvailable])
+      else
+        SomethingChanged := false;
+    end else
+      lHandler^.OnEvent(lHandler^.UserData, [prBroken]);
+    if SomethingChanged then
+      lHandler := FWaitPipeHandlers
+    else begin
+      lHandler := lHandler^.Next;
+      ChangedCount := 0;
+    end;
+    inc(ChangedCount);}
+  end;
+end;*)
+
+{------------------------------------------------------------------------------
+  Method: TWinCEWidgetSet.AppWaitMessage
+  Params:  None
+  Returns: Nothing
+
+  Passes execution control to Windows
+ ------------------------------------------------------------------------------}
+//roozbeh:new update...whole procedure body is added.what is it?
+procedure TCDWidgetSet.AppWaitMessage;
+begin
+end;
+
+{------------------------------------------------------------------------------
+  Method: TWinCEWidgetSet.AppTerminate
+  Params:  None
+  Returns: Nothing
+
+  Tells Windows to halt and destroy
+ ------------------------------------------------------------------------------}
+
+procedure TCDWidgetSet.AppTerminate;
+begin
+  //DebugLn('Trace:TWinCEWidgetSet.AppTerminate - Start');
+end;
+
+
+procedure TCDWidgetSet.AppSetIcon(const Small, Big: HICON);
+begin
+end;
+
+procedure TCDWidgetSet.AppSetTitle(const ATitle: string);
+begin
+end;
+
+procedure TCDWidgetSet.AppSetVisible(const AVisible: Boolean);
+begin
+end;
+
+function TCDWidgetSet.AppRemoveStayOnTopFlags(const ASystemTopAlso: Boolean = False): Boolean;
+begin
+end;
+
+function TCDWidgetSet.AppRestoreStayOnTopFlags(const ASystemTopAlso: Boolean = False): Boolean;
+begin
+end;
+
+procedure TCDWidgetSet.AppSetMainFormOnTaskBar(const DoSet: Boolean);
+begin
+end;
+
+{------------------------------------------------------------------------------
+  function: CreateTimer
+  Params: Interval:
+          TimerFunc: Callback
+  Returns: a Timer id (use this ID to destroy timer)
+
+  Design: A timer which calls TimerCallBackProc, is created.
+    The TimerCallBackProc calls the TimerFunc.
+ ------------------------------------------------------------------------------}
+function TCDWidgetSet.CreateTimer(Interval: integer; TimerFunc: TWSTimerProc) : THandle;
+begin
+end;
+
+{------------------------------------------------------------------------------
+  function: DestroyTimer
+  Params: TimerHandle
+  Returns:
+ ------------------------------------------------------------------------------}
+function TCDWidgetSet.DestroyTimer(TimerHandle: THandle) : boolean;
+begin
+end;
+(*
+procedure TWinCEWidgetSet.HandleWakeMainThread(Sender: TObject);
+begin
+  // wake up GUI thread by sending a message to it
+  Windows.PostMessage(AppHandle, WM_NULL, 0, 0);
+end;
+*)
+
+// This code is unnecessary in FPC 2.6+,
+// it was required when the 2.5.1 snapshot was created
+{$ifdef ver2_5}
+procedure PASCALMAIN; external name 'PASCALMAIN';
+
+procedure FPC_SHARED_LIB_START; [public, alias: 'FPC_SHARED_LIB_START'];
+begin
+   PASCALMAIN;
+end;
+{$endif}
+

lcl/interfaces/customdrawn/customdrawnwinapi.inc

@@ -2249,9 +2249,7 @@ begin
     exit;
 
   lOldBrush := SelectObject(DC, Brush);
-  {$ifndef ver2_4}
   LazDC.FillRect(Rect);
-  {$endif}
   SelectObject(DC, lOldBrush);
 
   Result := True;

lcl/interfaces/customdrawn/customdrawnwscontrols.pp

@@ -170,5 +170,8 @@ uses customdrawnwsforms;
 {$ifdef CD_X11}
   {$include customdrawnwscontrols.inc}
 {$endif}
+{$ifdef CD_Android}
+  {$include customdrawnwscontrols.inc}
+{$endif}
 
 end.

lcl/interfaces/customdrawn/customdrawnwsforms.pp

@@ -35,6 +35,7 @@ uses
   {$ifdef CD_Windows}Windows, customdrawn_WinProc,{$endif}
   {$ifdef CD_Cocoa}MacOSAll, CocoaAll, CocoaPrivate, CocoaUtils,{$endif}
   {$ifdef CD_X11}XShm, X, XLib, XUtil, XAtom, customdrawn_x11proc,{unitxft, Xft font support}{$endif}
+  {$ifdef CD_Android}customdrawn_androidproc,{$endif}
   // LazUtils
   lazutf8sysutils,
   // LCL
@@ -197,5 +198,8 @@ implementation
 {$ifdef CD_X11}
   {$include customdrawnwsforms_x11.inc}
 {$endif}
+{$ifdef CD_Android}
+  {$include customdrawnwsforms_android.inc}
+{$endif}
 
 end.

lcl/interfaces/customdrawn/customdrawnwsforms_android.inc

@@ -0,0 +1,131 @@
+{$MainForm customdrawnwsforms.pp}
+
+{ TCDWSCustomForm }
+
+class procedure TCDWSCustomForm.BackendAddCDWinControlToForm(const AForm: TCustomForm; ACDWinControl: TCDWinControl);
+{var
+  lWindowInfo: TX11WindowInfo;}
+begin
+{  lWindowInfo := TX11WindowInfo(AForm.Handle);
+  if lWindowInfo.Children = nil then lWindowInfo.Children := TFPList.Create;
+  lWindowInfo.Children.Add(ACDWinControl);}
+end;
+
+class function TCDWSCustomForm.BackendGetCDWinControlList(const AForm: TCustomForm): TFPList;
+{var
+  lWindowInfo: TX11WindowInfo;}
+begin
+{  lWindowInfo := TX11WindowInfo(AForm.Handle);
+  if lWindowInfo.Children = nil then lWindowInfo.Children := TFPList.Create;
+  Result := lWindowInfo.Children;}
+end;
+
+{------------------------------------------------------------------------------
+  Method: TCDWSCustomForm.CreateHandle
+  Params:  None
+  Returns: Nothing
+
+  Creates a Windows CE Form, initializes it according to it´s properties and shows it
+ ------------------------------------------------------------------------------}
+class function TCDWSCustomForm.CreateHandle(const AWinControl: TWinControl;
+  const AParams: TCreateParams): TLCLIntfHandle;
+var
+  lWindowInfo: TAndroidWindowInfo;
+  AForm: TCustomForm absolute AWinControl;
+begin
+  {$ifdef VerboseCDWindow}
+  DebugLn(Format(':>[TCDWSCustomForm.CreateHandle] AWinControl=%x Name=%s: %s',
+    [PtrInt(AWinControl), AWinControl.Name, AWinControl.ClassName]));
+  {$endif}
+
+
+  {$ifdef VerboseCDWindow}
+  DebugLn(Format(':<[TCDWSCustomForm.CreateHandle] Result=%x',
+    [Result]));
+  {$endif}
+end;
+
+class procedure TCDWSCustomForm.DestroyHandle(const AWinControl: TWinControl);
+begin
+
+end;
+
+class procedure TCDWSCustomForm.SetBorderIcons(const AForm: TCustomForm;
+ const ABorderIcons: TBorderIcons);
+begin
+end;
+
+class procedure TCDWSCustomForm.SetFormBorderStyle(const AForm: TCustomForm;
+          const AFormBorderStyle: TFormBorderStyle);
+begin
+  RecreateWnd(AForm);
+end;
+
+class procedure TCDWSCustomForm.SetBounds(const AWinControl: TWinControl;
+    const ALeft, ATop, AWidth, AHeight: Integer);
+begin
+  {$ifdef VerboseCDWindow}
+  DebugLn(Format('[TCDWSCustomForm.SetBounds] AWinControl=%x ALeft=%d ATop=%d AWidth=%d AHeight=%d',
+    [PtrInt(AWinControl), ALeft, ATop, AWidth, AHeight]));
+  {$endif}
+end;
+
+class procedure TCDWSCustomForm.SetIcon(const AForm: TCustomForm; const Small, Big: HICON);
+begin
+end;
+
+class procedure TCDWSCustomForm.SetShowInTaskbar(const AForm: TCustomForm;
+  const AValue: TShowInTaskbar);
+begin
+end;
+
+class procedure TCDWSCustomForm.ShowModal(const ACustomForm: TCustomForm);
+begin
+end;
+
+class procedure TCDWSCustomForm.ShowHide(const AWinControl: TWinControl);
+begin
+//  lWindowInfo := TX11WindowInfo(AWinControl.Handle);
+//  lWindow := lWindowInfo.Window;
+
+  if AWinControl.Visible then
+  begin
+    {$ifdef VerboseCDWindow}
+    DebugLn(Format('[TCDWSCustomForm.ShowHide] Visible=True AWinControl=%x Handle=%x',
+      [PtrInt(AWinControl), PtrInt(AWinControl.Handle)]));
+    {$endif}
+  end
+  else
+  begin
+    {$ifdef VerboseCDWindow}
+    DebugLn(Format('[TCDWSCustomForm.ShowHide] Visible=False AWinControl=%x', [PtrInt(AWinControl)]));
+    {$endif}
+  end;
+end;
+
+class function TCDWSCustomForm.GetText(const AWinControl: TWinControl; var AText: String): Boolean;
+begin
+  AText := '';
+end;
+
+class function TCDWSCustomForm.GetTextLen(const AWinControl: TWinControl; var ALength: Integer): Boolean;
+var
+  lText: string;
+begin
+  Result := GetText(AWinControl, lText);
+  ALength := Length(lText);
+end;
+
+class procedure TCDWSCustomForm.SetText(const AWinControl: TWinControl; const AText: String);
+begin
+end;
+
+class function TCDWSCustomForm.GetClientBounds(const AWincontrol: TWinControl; var ARect: TRect): Boolean;
+begin
+end;
+
+class function TCDWSCustomForm.GetClientRect(const AWincontrol: TWinControl; var ARect: TRect): Boolean;
+begin
+end;
+
+

lcl/interfaces/lcl.lpk

@@ -110,7 +110,7 @@ end;"/>
     <License Value="modified LGPL-2
 "/>
     <Version Major="1" Release="1"/>
-    <Files Count="380">
+    <Files Count="384">
       <Item1>
         <Filename Value="android/androidint.pas"/>
         <AddToUsesPkgSection Value="False"/>
@@ -1881,6 +1881,23 @@ end;"/>
         <Filename Value="customdrawn/customdrawnwinapi_x11.inc"/>
         <Type Value="Include"/>
       </Item380>
+      <Item381>
+        <Filename Value="customdrawn/customdrawn_androidproc.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+        <UnitName Value="customdrawn_androidproc"/>
+      </Item381>
+      <Item382>
+        <Filename Value="customdrawn/customdrawnobject_android.inc"/>
+        <Type Value="Include"/>
+      </Item382>
+      <Item383>
+        <Filename Value="customdrawn/customdrawnwinapi_android.inc"/>
+        <Type Value="Include"/>
+      </Item383>
+      <Item384>
+        <Filename Value="customdrawn/customdrawnwsforms_android.inc"/>
+        <Type Value="Include"/>
+      </Item384>
     </Files>
     <LazDoc Paths="../../docs/xml/lcl"/>
     <i18n>