Merge pull request #157 from bgrabitmap/dev-lazpaint

Dev lazpaint v7.1.3
bgrabitmap · May 14, 2020 · 860cbb4 · 860cbb4
2 parents f5deb60 + 4bc8f0e
commit 860cbb4
Show file tree

Hide file tree

Showing 18 changed files with 3,706 additions and 3,626 deletions.
diff --git a/lazpaint/lazpaint.lpi b/lazpaint/lazpaint.lpi
@@ -24,7 +24,7 @@
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="7"/>
       <MinorVersionNr Value="1"/>
-      <RevisionNr Value="2"/>
+      <RevisionNr Value="3"/>
       <CharSet Value="04B0"/>
       <StringTable CompanyName="http://sourceforge.net/projects/lazpaint/" ProductName="LazPaint" InternalName="lazpaint" OriginalFilename="lazpaint.exe"/>
     </VersionInfo>

diff --git a/lazpaint/lazpaintembeddedpack.lpk b/lazpaint/lazpaintembeddedpack.lpk
@@ -26,7 +26,7 @@
         </Debugging>
       </Linking>
     </CompilerOptions>
-    <Version Major="7" Minor="1" Release="2"/>
+    <Version Major="7" Minor="1" Release="3"/>
     <Files Count="94">
       <Item1>
         <Filename Value="lazpaintinstance.pas"/>

diff --git a/lazpaint/lazpainttype.pas b/lazpaint/lazpainttype.pas
@@ -10,7 +10,7 @@ interface
   {$IFDEF LINUX}, InterfaceBase{$ENDIF};
 
 const
-  LazPaintVersion = 7010200;
+  LazPaintVersion = 7010300;
 
   function LazPaintVersionStr: string;
 

diff --git a/lazpaint/maintoolbar.inc b/lazpaint/maintoolbar.inc
@@ -22,6 +22,7 @@ procedure TFMain.CreateToolbarElements;
       vf.GradInterpolation:= ColorInterpolation;
     end;
     if Assigned(lbl) then lbl.OnMouseMove:= mouseMove;
+    pnl.PopupMenu := nil;
     pnl.OnMouseMove:= mouseMove;
     vf.OnMouseMove:= mouseMove;
   end;