Skip to content

Commit 6c130f4

Browse files
livecodesebastienlivecodesebastien
committed
Merge branch 'develop' into 'refactor-syntax_unicode' - conflicts solved and refactoring almost finished
1 parent 8d1708c commit 6c130f4

File tree

131 files changed

+1463
-6870
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+1463
-6870
lines changed

‎engine/kernel.vcproj‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7747,7 +7747,6 @@
77477747
<File
77487748
RelativePath=".\exec-tests\datetime\EvalSeconds.test"
77497749
>
7750-
<<<<<<< HEAD
77517750
</File>
77527751
<File
77537752
RelativePath=".\exec-tests\datetime\EvalTicks.test"
@@ -7772,15 +7771,6 @@
77727771
</Filter>
77737772
<Filter
77747773
Name="logic"
7775-
=======
7776-
<Tool
7777-
Name="VCCLCompilerTool"
7778-
/>
7779-
</FileConfiguration>
7780-
</File>
7781-
<File
7782-
RelativePath=".\src\sysspec.cpp"
7783-
>>>>>>> develop
77847774
>
77857775
<File
77867776
RelativePath=".\exec-tests\logic\EvalAnd.test"

‎engine/src/button.cpp‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ MCPropertyInfo MCButton::kProperties[] =
268268
DEFINE_RW_OBJ_PROPERTY(P_DEFAULT, Bool, MCButton, Default)
269269
DEFINE_RW_OBJ_PROPERTY(P_TEXT, String, MCButton, Text)
270270
DEFINE_RW_OBJ_PROPERTY(P_UNICODE_TEXT, BinaryString, MCButton, UnicodeText)
271-
DEFINE_RW_OBJ_PROPERTY(P_ICON_GRAVITY, String, MCButton, IconGravity)
271+
// MERG-2014-06-25 [[ IconGravity ]]
272+
DEFINE_RW_OBJ_ENUM_PROPERTY(P_ICON_GRAVITY, InterfaceButtonIconGravity, MCButton, IconGravity)
272273

273274
DEFINE_RW_OBJ_CUSTOM_PROPERTY(P_ICON, InterfaceButtonIcon, MCButton, Icon)
274275
DEFINE_RW_OBJ_CUSTOM_PROPERTY(P_ARMED_ICON, InterfaceButtonIcon, MCButton, ArmedIcon)
@@ -282,8 +283,7 @@ MCPropertyInfo MCButton::kProperties[] =
282283

283284
DEFINE_WO_OBJ_CHAR_CHUNK_PROPERTY(P_HILITE, Bool, MCButton, Hilite)
284285
DEFINE_WO_OBJ_CHAR_CHUNK_PROPERTY(P_DISABLED, Bool, MCButton, Disabled)
285-
DEFINE_WO_OBJ_CHAR_CHUNK_PROPERTY(P_ENABLED, Bool, MCButton, Enabled)
286-
286+
DEFINE_WO_OBJ_CHAR_CHUNK_PROPERTY(P_ENABLED, Bool, MCButton, Enabled)
287287
};
288288

289289
MCObjectPropertyTable MCButton::kPropertyTable =
@@ -295,25 +295,6 @@ MCObjectPropertyTable MCButton::kPropertyTable =
295295

296296
////////////////////////////////////////////////////////////////////////////////
297297

298-
// MW-2014-06-19: [[ IconGravity ]] Strings for the 'iconGravity' property.
299-
static const char *MCgravitystrings[] =
300-
{
301-
"",
302-
"left",
303-
"top",
304-
"right",
305-
"bottom",
306-
"topLeft",
307-
"topRight",
308-
"bottomLeft",
309-
"bottomRight",
310-
"center",
311-
"resize",
312-
"resizeAspect",
313-
"resizeAspectFill",
314-
nil,
315-
};
316-
317298
MCButton::MCButton()
318299
{
319300
flags |= F_STANDARD | F_TRAVERSAL_ON | F_HILITE_BORDER | F_HILITE_FILL

‎engine/src/button.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,9 @@ class MCButton : public MCControl
441441
void GetDisabledIcon(MCExecContext& ctxt, MCInterfaceButtonIcon& r_icon);
442442
void SetIcon(MCExecContext& ctxt, const MCInterfaceButtonIcon& p_icon);
443443
void GetIcon(MCExecContext& ctxt, MCInterfaceButtonIcon& r_icon);
444-
void GetIconGravity(MCExecContext, MCStringRef &r_gravity);
445-
void SetIconGravity(MCExecContext &ctxt, MCStringRef p_gravity);
444+
// MERG-2014-06-25 [[ IconGravity ]]
445+
void GetIconGravity(MCExecContext &ctxt, intenum_t &r_gravity);
446+
void SetIconGravity(MCExecContext &ctxt, intenum_t p_gravity);
446447
void SetHiliteIcon(MCExecContext& ctxt, const MCInterfaceButtonIcon& p_icon);
447448
void GetHiliteIcon(MCExecContext& ctxt, MCInterfaceButtonIcon& r_icon);
448449
void SetVisitedIcon(MCExecContext& ctxt, const MCInterfaceButtonIcon& p_icon);

‎engine/src/coretextfonts.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ void core_text_get_font_styles(MCStringRef p_name, uint32_t p_size, MCListRef &r
272272
t_font_family = (CTFontRef)coretext_font_create_with_name_and_size(p_name, p_size);
273273

274274
MCAutoListRef t_styles;
275-
/* UNCHECKED */ MCListCreateMutable('\n', t_styles);
275+
/* UNCHECKED */ MCListCreateMutable('\n', &t_styles);
276276

277277
if (t_font_family != NULL)
278278
{

0 commit comments

Comments
 (0)