Skip to content

Commit

Permalink
Code changes 1.8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulSquires committed Nov 13, 2018
1 parent cf49581 commit 962275a
Show file tree
Hide file tree
Showing 24 changed files with 494 additions and 86 deletions.
68 changes: 47 additions & 21 deletions Help/WinFBE/Visual Designer/Controls/ComboBox.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,86 +43,90 @@ <h3 id="properties">Properties</h3>
<td>Gets or sets the control type value. Always <strong>ControlType.ComboBox</strong> and used when adding control to the application’s form collection.</td>
</tr>
<tr class="even">
<td>DropDownStyle</td>
<td>Gets or sets the style of the control. Refer to the <a href="#ComboBoxStyle">ComboBoxStyle</a> Enum</td>
</tr>
<tr class="odd">
<td>Enabled</td>
<td>Gets or sets a value (true/false) indicating whether the control can respond to user interaction.</td>
</tr>
<tr class="odd">
<tr class="even">
<td>Focused</td>
<td>Gets or sets a value (true/false) indicating whether the control has input focus.</td>
</tr>
<tr class="even">
<tr class="odd">
<td>Font</td>
<td>Gets or sets the font for the control. Refer to the Font object.</td>
</tr>
<tr class="odd">
<tr class="even">
<td>Height</td>
<td>Gets or sets the height of the control.</td>
</tr>
<tr class="even">
<tr class="odd">
<td>hWindow</td>
<td>Gets the Windows handle (hwnd) of the control.</td>
</tr>
<tr class="odd">
<tr class="even">
<td>hWindowParent</td>
<td>Gets or sets the Windows handle (hwnd) of the parent control.</td>
</tr>
<tr class="even">
<tr class="odd">
<td>IntegralHeight</td>
<td>Gets or sets a value (true/false) indicating whether the list can contain only complete items.</td>
</tr>
<tr class="odd">
<tr class="even">
<td>Left</td>
<td>Gets or sets the distance, in pixels, between the left edge of the control and the left edge of its container's client area (normally the form).</td>
</tr>
<tr class="even">
<tr class="odd">
<td>Location</td>
<td>Gets or sets the top and left position of the control. Get: returns <a href="#wfxPoint">wfxPoint</a> object. Set: (left, top).</td>
</tr>
<tr class="odd">
<tr class="even">
<td>Locked</td>
<td>Gets or sets a value (true/false) indicating whether the control can be moved or resized.</td>
</tr>
<tr class="even">
<tr class="odd">
<td>Parent</td>
<td>Gets or sets the parent container of the control.</td>
</tr>
<tr class="odd">
<tr class="even">
<td>SelectedItem</td>
<td>Gets or sets the selected item in the combobox (using a <a href="#wfxComboBoxItem">wfxComboBoxItem</a> object).</td>
</tr>
<tr class="even">
<tr class="odd">
<td>SelectedIndex</td>
<td>Gets or sets the index value of the selected item in the combobox.</td>
</tr>
<tr class="odd">
<tr class="even">
<td>Size</td>
<td>Gets or sets the size of the form. Get: returns <a href="#wfxSize">wfxSize</a> object. Set: (width, height)</td>
</tr>
<tr class="even">
<tr class="odd">
<td>Sorted</td>
<td>Gets or sets a value (true/false) indicating if the combobox should be sorted.</td>
</tr>
<tr class="odd">
<tr class="even">
<td>TabIndex</td>
<td>Gets or sets the position that the control occupies in the TAB position.</td>
</tr>
<tr class="even">
<tr class="odd">
<td>TabStop</td>
<td>Gets or sets a value (true/false) indicating whether the user can use the TAB key to give focus to the control.</td>
</tr>
<tr class="odd">
<tr class="even">
<td>Tag</td>
<td>Gets or sets user defined text associated with the form.</td>
</tr>
<tr class="even">
<tr class="odd">
<td>Top</td>
<td>Gets or sets the distance, in pixels, between the top edge of the control and the top edge of its container's client area (normally the form).</td>
</tr>
<tr class="odd">
<tr class="even">
<td>Visible</td>
<td>Gets or sets a value (true/false) indicating whether the control is displayed.</td>
</tr>
<tr class="even">
<tr class="odd">
<td>Width</td>
<td>Gets or sets the width of the control.</td>
</tr>
Expand Down Expand Up @@ -242,7 +246,7 @@ <h3 id="events">Events</h3>
</tr>
<tr class="odd">
<td>TextChanged</td>
<td>Occurs when the Text property is changed by either a programmatic modification or user interaction.</td>
<td>Occurs when the Text property is changed by either a programmatic modification or user interaction. Only valid for DropDownStyle equal to ComboBoxStyle.Simple</td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -329,6 +333,28 @@ <h2 id="working-with-a-combobox">Working with a ComboBox</h2>
? Form1.Combo1.Item(i).Text, Form1.Combo1.Item(i).Data32
Next
</code></pre>
<h5 id="comboboxstyle">ComboBoxStyle</h5>
<pre><code>Enum ComboBoxStyle
Simple = 1
DropDown
DropDownList
End Enum
</code></pre>
<h5 id="wfxsize">wfxSize</h5>
<pre><code>Type wfxSize
private:
_Width as Long
_Height as long

public:
Declare Property Width() As Long
Declare Property Width( ByVal nValue As Long )
Declare Property Height() As Long
Declare Property Height( ByVal nValue As Long )
Declare Function IsEmpty() as Boolean
Declare Constructor ( byval nWidth as long = 0, byval nHeight as long = 0)
End Type
</code></pre>
<h5 id="wfxpoint">wfxPoint</h5>
<pre><code>Type wfxPoint
private:
Expand Down
27 changes: 25 additions & 2 deletions Help/WinFBE/Visual Designer/Controls/ComboBox.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
| AllowDrop | Gets or sets a value (true/false) indicating whether the control will accept data that is dragged onto it.|
| CtrlId | Gets or sets a value indicating the control ID of the control.|
| CtrlType | Gets or sets the control type value. Always **ControlType.ComboBox** and used when adding control to the application’s form collection.|
| DropDownStyle | Gets or sets the style of the control. Refer to the [ComboBoxStyle](#ComboBoxStyle) Enum |
| Enabled | Gets or sets a value (true/false) indicating whether the control can respond to user interaction.|
| Focused | Gets or sets a value (true/false) indicating whether the control has input focus.|
| Font | Gets or sets the font for the control. Refer to the Font object.|
Expand Down Expand Up @@ -59,7 +60,7 @@
| MouseUp | Occurs when the mouse pointer is over the control and a mouse button is released.|
| DropDown | Occurs when the drop-down portion of the combobox is shown.|
| DropDownClosed | Indicates that the drop-down portion of the combobox has closed.|
| TextChanged | Occurs when the Text property is changed by either a programmatic modification or user interaction.|
| TextChanged | Occurs when the Text property is changed by either a programmatic modification or user interaction. Only valid for DropDownStyle equal to ComboBoxStyle.Simple |

### Items Collection (wfxComboBoxItemsCollection)
| Name | Description |
Expand Down Expand Up @@ -119,8 +120,30 @@ For i as long = 0 to Form1.Combo.Items.Count – 1
Next
```

##### ComboBoxStyle
```
Enum ComboBoxStyle
Simple = 1
DropDown
DropDownList
End Enum
```
##### wfxSize
```
Type wfxSize
private:
_Width as Long
_Height as long

public:
Declare Property Width() As Long
Declare Property Width( ByVal nValue As Long )
Declare Property Height() As Long
Declare Property Height( ByVal nValue As Long )
Declare Function IsEmpty() as Boolean
Declare Constructor ( byval nWidth as long = 0, byval nHeight as long = 0)
End Type
```
##### wfxPoint

```
Expand Down
Binary file modified WinFBE.wfbe
Binary file not shown.
Binary file modified WinFBE32.exe
Binary file not shown.
Binary file modified WinFBE64.exe
Binary file not shown.
13 changes: 1 addition & 12 deletions _compile32bit.bat
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
set FBLIBDIR=win32
set FBCPATH=x:\FB\WinFBE_Suite-Editor\FreeBASIC-1.06.0
set FBCPATH=x:\FB\WinFBE_Suite\FreeBASIC-1.06.0

cd src
%FBCPATH%\fbc32 WinFBE.bas -x ..\WinFBE32.exe WinFBE.rc -s gui
cd ..

@if ErrorLevel 1 goto compileerror
@echo SUCCESS!! WinFBE (32 bit) built.

goto exit

:compileerror
@echo *** COMPILE ERROR ***

:exit
@pause

12 changes: 1 addition & 11 deletions _compile64bit.bat
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
set FBLIBDIR=win64
set FBCPATH=X:\FB\WinFBE_Suite-Editor\FreeBASIC-1.06.0
set FBCPATH=X:\FB\WinFBE_Suite\FreeBASIC-1.06.0

cd src
%FBCPATH%\fbc64 WinFBE.bas -x ..\WinFBE64.exe -O 2 WinFBE.rc -s gui
cd ..

@if ErrorLevel 1 goto compileerror
@echo SUCCESS!! WinFBE (64 bit) built.

goto exit

:compileerror
@echo *** COMPILE ERROR ***

:exit
@pause

8 changes: 8 additions & 0 deletions changes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Version 1.8.4 (November 13, 2018)
- Added: View ToolBox menu item is now implemented.
- Fixed: Canceling New Project creation would not erase new project in memory object.
- Fixed: Help Viewer screen flickering by adding WS_CLIPCHILDREN WS_CLIPSIBLINGS window styles.
- Fixed: Help Viewer treeview nodes are now selected to reflect the currently loaded help page.
- Fixed: When Help Viewer has focus, accelerator keys no longer act on the code editor.
- Fixed: Sizing of embedded Help Viewer web browser so it resizes correctly at bottom of the form.

Version 1.8.3 (November 10, 2018)
- Added: Back, Forward, Print, Find buttons to the Help Viewer display dialog.
- Added: MaximizeBox, MinimizeBox to the Help Viewer display dialog.
Expand Down
Binary file added src/Images/leftarrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Images/leftarrow_16x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Images/rightarrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Images/rightarrow_16x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/WinFBE.bas
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Using Afx

#Define APPNAME WStr("WinFBE - FreeBASIC Editor")
#Define APPNAMESHORT WStr("WinFBE")
#Define APPVERSION WStr("1.8.3")
#Define APPVERSION WStr("1.8.4")

#ifdef __FB_64BIT__
#Define APPBITS WStr(" (64-bit)")
Expand Down Expand Up @@ -107,6 +107,7 @@ Using Afx
#Include Once "frmFindReplace.inc"
#Include Once "frmProjectOptions.inc"
#Include Once "frmHelpViewer.inc"
#Include Once "frmMenuEditor.inc"
#Include Once "frmMain.inc"


Expand Down
12 changes: 8 additions & 4 deletions src/WinFBE.rc
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ IMAGE_BADCOMPILE ICON "IMAGES\\BADCOMPILE.ICO"
IMAGE_TICK ICON "IMAGES\\TICK16.ICO"
IMAGE_NOTICK ICON "IMAGES\\NOTICK16.ICO"

IMAGE_DOWN RCDATA "IMAGES\\DOWNARROW.PNG"
IMAGE_DOWN16 RCDATA "IMAGES\\DOWNARROW_16X.PNG"
IMAGE_UP RCDATA "IMAGES\\UPARROW.PNG"
IMAGE_UP16 RCDATA "IMAGES\\UPARROW_16X.PNG"
IMAGE_ARROWLEFT RCDATA "IMAGES\\LEFTARROW.PNG"
IMAGE_ARROWLEFT16 RCDATA "IMAGES\\LEFTARROW_16X.PNG"
IMAGE_ARROWRIGHT RCDATA "IMAGES\\RIGHTARROW.PNG"
IMAGE_ARROWRIGHT16 RCDATA "IMAGES\\RIGHTARROW_16X.PNG"
IMAGE_ARROWDOWN RCDATA "IMAGES\\DOWNARROW.PNG"
IMAGE_ARROWDOWN16 RCDATA "IMAGES\\DOWNARROW_16X.PNG"
IMAGE_ARROWUP RCDATA "IMAGES\\UPARROW.PNG"
IMAGE_ARROWUP16 RCDATA "IMAGES\\UPARROW_16X.PNG"

IMAGE_METHOD RCDATA "IMAGES\\METHOD_16X.PNG"
IMAGE_CLASS RCDATA "IMAGES\\CLASS_16X.PNG"
Expand Down
7 changes: 2 additions & 5 deletions src/clsConfig.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1400,11 +1400,8 @@ Function clsConfig.ProjectLoadFromFile( byref wzFile as WSTRING) As BOOLEAN
gApp.Projects(idx).ProjectBuild = GetSelectedBuildGUID()
end if
' If no other Projects have been designated the as the active project then make
' this project the active one.
if gApp.GetActiveProjectIndex = 0 THEN
gApp.SetActiveProject(gApp.Projects(idx).hExplorerRootNode)
END IF
' Set this project as active
gApp.SetActiveProject(gApp.Projects(idx).hExplorerRootNode)
Treeview_EnsureVisible(hTV, gApp.Projects(idx).hExplorerRootNode)
Expand Down
8 changes: 4 additions & 4 deletions src/frmCompileConfig.inc
Original file line number Diff line number Diff line change
Expand Up @@ -439,18 +439,18 @@ Function frmCompileConfig_Show( ByVal hWndParent As HWnd, _

hCtrl = _
pWindow->AddControl("BITMAPBUTTON", , IDC_FRMCOMPILECONFIG_CMDUP, "", 243, 10, 32, 32, _
WS_CHILD Or WS_VISIBLE Or WS_TABSTOP Or WS_CLIPSIBLINGS Or WS_CLIPCHILDREN Or BS_ICON Or BS_PUSHBUTTON Or BS_NOTIFY Or BS_CENTER Or BS_VCENTER Or LR_DEFAULTCOLOR Or LR_SHARED, _
WS_CHILD Or WS_VISIBLE Or WS_TABSTOP Or WS_CLIPSIBLINGS Or WS_CLIPCHILDREN Or BS_BITMAP Or BS_PUSHBUTTON Or BS_NOTIFY Or BS_CENTER Or BS_VCENTER Or LR_DEFAULTCOLOR Or LR_SHARED, _
WS_EX_LEFT Or WS_EX_LTRREADING)
wszImage = iif(pWindow->DPI > 96, "IMAGE_UP", "IMAGE_UP16")
wszImage = iif(pWindow->DPI > 96, "IMAGE_ARROWUP", "IMAGE_ARROWUP16")
hBitmap = AfxGdipImageFromRes(pWindow->InstanceHandle, wszImage, 0, false, IMAGE_BITMAP, 0)
SendMessage(hCtrl, BM_SETIMAGE, IMAGE_BITMAP, cast(LPARAM, hBitmap))
IF hBitmap THEN DeleteObject(hBitmap)

hCtrl = _
pWindow->AddControl("BITMAPBUTTON", , IDC_FRMCOMPILECONFIG_CMDDOWN, "", 243, 159, 32, 32, _
WS_CHILD Or WS_VISIBLE Or WS_TABSTOP Or WS_CLIPSIBLINGS Or WS_CLIPCHILDREN Or BS_ICON Or BS_PUSHBUTTON Or BS_NOTIFY Or BS_CENTER Or BS_VCENTER Or LR_DEFAULTCOLOR Or LR_SHARED, _
WS_CHILD Or WS_VISIBLE Or WS_TABSTOP Or WS_CLIPSIBLINGS Or WS_CLIPCHILDREN Or BS_BITMAP Or BS_PUSHBUTTON Or BS_NOTIFY Or BS_CENTER Or BS_VCENTER Or LR_DEFAULTCOLOR Or LR_SHARED, _
WS_EX_LEFT Or WS_EX_LTRREADING)
wszImage = iif(pWindow->DPI > 96, "IMAGE_DOWN", "IMAGE_DOWN16")
wszImage = iif(pWindow->DPI > 96, "IMAGE_ARROWDOWN", "IMAGE_ARROWDOWN16")
hBitmap = AfxGdipImageFromRes(pWindow->InstanceHandle, wszImage, 0, false, IMAGE_BITMAP, 0)
SendMessage(hCtrl, BM_SETIMAGE, IMAGE_BITMAP, cast(LPARAM, hBitmap))
IF hBitmap THEN DeleteObject(hBitmap)
Expand Down
Loading

0 comments on commit 962275a

Please sign in to comment.