Skip to content

Commit

Permalink
Fixed: Showing MDI Child Form on Design Mode
Browse files Browse the repository at this point in the history
  • Loading branch information
XusinboyBekchanov committed Aug 1, 2022
1 parent 8ec48fd commit c22b43a
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 114 deletions.
6 changes: 5 additions & 1 deletion mff/ComboBoxEdit.bas
Expand Up @@ -219,7 +219,11 @@ Namespace My.Sys.Forms

Private Property ComboBoxEdit.Text ByRef As WString
If FStyle >= cbDropDownList Then
FText = This.Item(This.ItemIndex)
If This.ItemIndex > -1 Then
FText = This.Item(This.ItemIndex)
Else
FText = ""
End If
Else
#ifdef __USE_GTK__
FText = WStr(*gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(widget)))
Expand Down
14 changes: 7 additions & 7 deletions mff/Control.bas
Expand Up @@ -903,11 +903,11 @@ Namespace My.Sys.Forms
If (Style And (WS_CLIPCHILDREN Or WS_CLIPSIBLINGS)) <> (WS_CLIPCHILDREN Or WS_CLIPSIBLINGS) Then
Style = Style Or (WS_CLIPCHILDREN Or WS_CLIPSIBLINGS)
End If
If (Style And (ATabStop(Abs_(FTabStop)) Or AGrouped(Abs_(FGrouped)))) <> (ATabStop(Abs_(FTabStop)) Or AGrouped(Abs_(FGrouped))) Then
Style = Style Or (ATabStop(Abs_(FTabStop)) Or AGrouped(Abs_(FGrouped)))
If (Style And (ATabStop(abs_(FTabStop)) Or AGrouped(abs_(FGrouped)))) <> (ATabStop(abs_(FTabStop)) Or AGrouped(abs_(FGrouped))) Then
Style = Style Or (ATabStop(abs_(FTabStop)) Or AGrouped(abs_(FGrouped)))
End If
If (ExStyle And AControlParent(Abs_(FControlParent))) <> AControlParent(Abs_(FControlParent)) Then
ExStyle = ExStyle Or AControlParent(Abs_(FControlParent))
If (ExStyle And AControlParent(abs_(FControlParent))) <> AControlParent(abs_(FControlParent)) Then
ExStyle = ExStyle Or AControlParent(abs_(FControlParent))
End If
End If
CreationControl = @This
Expand All @@ -922,9 +922,9 @@ Namespace My.Sys.Forms
nTop, _
nWidth, _
nHeight, _
HParent,_
Cast(HMENU, ControlID),_
Instance,_
HParent, _
Cast(HMENU, ControlID), _
Instance, _
@This) ' '
#endif
#elseif defined(__USE_JNI__)
Expand Down

0 comments on commit c22b43a

Please sign in to comment.