界面库

整理

designer/tslvcldesigner.tsf

@@ -428,8 +428,9 @@ type TVclDesigner = class(tvcform)
         if e.wparam = 123 and e.lparam=123 then 
         begin
             if o.height>Foh then 
-                o.height := Foh;
+            begin
-            
+                o.height := Foh; //gtk 逻辑正确但是设置无效
+            end             
         end 
     end 
     function openclassfile(); //打开编辑器

funcext/tvclib/ugtkinterface.tsf

@@ -1493,7 +1493,6 @@ type tsgtkapi = class(tgtkapis)
         brc := gtk_object_get_data(dc,"brush.color");	
         if pw>0 then cairo_set_line_width(dc,pw);
         else cairo_set_line_width(dc,1);        
-        
         mx := (l+r)/2+x;
         my := (b+t)/2+y;
         cairo_translate(dc,mx,my);
@@ -1942,7 +1941,6 @@ type tsgtkapi = class(tgtkapis)
             //cairo_paint_with_alpha(hdc,0);
             //cairo_paint_with_alpha(hdc,1);
             //cairo_set_source_rgba(hdc,  1.0,  1.0,  1.0, 0);            
-            
         end      
         cairo_fill(hdc);
         cairo_scale(hdc,1/p1,1/p2);
@@ -2086,7 +2084,6 @@ type tsgtkapi = class(tgtkapis)
 		    cbmp := class(tUIglobalData).uigetdata("G_T_BITMAP_");
 		    if not cbmp then return 0;
 		    class(TGdiplusflat).GdipCreateBitmapFromHBITMAP(hbmImage,0,r1);
-
 		    bmp := createobject(cbmp);
 		    bmp.Handle := r1;
 		    if id=-1 then obj.Push(bmp);
@@ -2110,11 +2107,9 @@ type tsgtkapi = class(tgtkapis)
 		end 
 		function ImageList_LoadImageA2(hi:pointer;lpbmp:pointer;cx:integer;cGrow:integer;  crMask:integer;uType:integer;uFlags:integer):pointer;
 		begin		
-		
 		end 
 		function ImageList_GetBkColor(himl:pointer):integer;
 		begin
-
 		end 
 		function ImageList_GetDragImage(ppt:pointer;pptHotspot:pointer):pointer;
 		function ImageList_GetImageCount(himl:pointer):integer;  
@@ -2375,7 +2370,6 @@ type tsgtkapi = class(tgtkapis)
     end 
     function ChooseFontA(LOGFONTA:pointer):integer;
     begin        
-        
         obj := new ttagCHOOSEFONTA(LOGFONTA);
         lgobj := obj._getvalue_("lplogfont");
         ht := lgobj._getvalue_("height");
@@ -2482,7 +2476,6 @@ type tsgtkapi = class(tgtkapis)
         end 
         gtk_widget_destroy(cdlg);
         return r;              
-           
     end 
     function SHGetPathFromIDListA(LPBROWSEINFOA:pointer;var buf:string ):integer;
     begin
@@ -5900,24 +5893,20 @@ type tgtk_im_object = class(tgtk_ctl_object)
             "commit":
             begin   
                FCommit :=  ReadStringFromPtr(c); 
-               //echo FCommit,FCtl,"**\r\n"; 
                if FCtl then 
                begin
                    s := utf8toansi(FCommit);
                    for i:= 1 to length(s) do
                    begin 
-                       //echo "***\r\n",ord(s[i]),">>",FCtl._const.WM_CHAR,"<<<";
                        FCtl.CallTslVclProc(_const.WM_CHAR,ord(s[i]),0);
                    end 
                end 
-               //echo "cmt=====",tostn(FCommit);  
             end         
         end;           
     end 
     function GtkBaseEventName();override; //°ó¶¨µÄÏûÏ¢
     begin        
-        //"commit","delete-surrounding",
+        return array("commit");//,"preedit-changed","preedit-end","preedit-start","retrieve-surrounding");//"commit","delete-surrounding",
-        return array("commit");//,"preedit-changed","preedit-end","preedit-start","retrieve-surrounding");
     end     
     function focusin();//focus in 
     begin
@@ -5983,7 +5972,6 @@ type tgtk_ctl_object_scroll = class(tgtk_ctl_object)
     function Create(h);override;
     begin
         inherited;
-        //Connect("event",thisfunction(scrollevent));
     end  
     function  GtkBaseEventName();override;
     begin
@@ -5993,14 +5981,12 @@ type tgtk_ctl_object_scroll = class(tgtk_ctl_object)
     begin
         return false;
     end 
-
 end 
 type tgtk_ctl_object_scroll_Bar = class(tgtk_ctl_object)
     function Create(h);override;
     begin
         inherited;
         Connect("event",thisfunction(scrollevent));       
-        
     end  
     function scrollevent(a,b,c,d);
     begin