Skip to content

Commit 996e844

Browse files
should be able to parse wxWidgets without defining platform specific macros
1 parent d06f1e4 commit 996e844

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

src/parser.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ This context starts after #if, #elif, and #pragma to capture everyting till a ne
11091109
}
11101110
}
11111111

1112-
<ctxGeneral,ctxDisabledCode>^{WS}*#{WS}*else{IgnorableTrailingContext}{NL} {
1112+
<ctxGeneral,ctxDisabledCode>^{WS}*#{WS}*else{TS} {
11131113
LOG();
11141114
if (!codeSegmentDependsOnMacroDefinition()) {
11151115
LOG();

test/app/cppparsertest.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -543,13 +543,14 @@ CppParser constructCppParserForTest()
543543
"wxTRY",
544544
"WXUNUSED",
545545
"WXUNUSED_UNLESS_DEBUG",
546-
"wxW64"});
546+
"wxW64",
547+
"WX_OSX_BRIDGE_RETAINED"});
547548

548549
parser.addUndefinedNames({"SWIG",
549550
"CPPPARSER_DISABLED_USING_IFNDEF_PARAM_TEST",
550-
"__WXMSW__",
551+
// "__WXMSW__",
551552
"__OBJC__",
552-
"__WXOSX__",
553+
// "__WXOSX__",
553554
"WXBUILDING",
554555
"wxHAS_SYSTEM_THEMED_CONTROL"});
555556

test/e2e/test_input/wxWidgets/include/wx/kbdstate.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ class WXDLLIMPEXP_CORE wxKeyboardState
2828
m_shiftDown(shiftDown),
2929
m_altDown(altDown),
3030
m_metaDown(metaDown)
31-
#ifdef __WXOSX__
32-
,m_rawControlDown(false)
33-
#endif
31+
// CIB #ifdef __WXOSX__
32+
// CIB ,m_rawControlDown(false)
33+
// CIB #endif
3434
{
3535
}
3636

@@ -48,9 +48,9 @@ class WXDLLIMPEXP_CORE wxKeyboardState
4848
return (m_controlDown ? wxMOD_CONTROL : 0) |
4949
(m_shiftDown ? wxMOD_SHIFT : 0) |
5050
(m_metaDown ? wxMOD_META : 0) |
51-
#ifdef __WXOSX__
52-
(m_rawControlDown ? wxMOD_RAW_CONTROL : 0) |
53-
#endif
51+
// CIB #ifdef __WXOSX__
52+
// CIB (m_rawControlDown ? wxMOD_RAW_CONTROL : 0) |
53+
// CIB #endif
5454
(m_altDown ? wxMOD_ALT : 0);
5555
}
5656

test/e2e/test_input/wxWidgets/include/wx/window.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,11 +1434,11 @@ class WXDLLIMPEXP_CORE wxWindowBase : public wxEvtHandler
14341434

14351435
// Accept files for dragging
14361436
virtual void DragAcceptFiles(bool accept)
1437-
#ifdef __WXMSW__
1437+
// CIB #ifdef __WXMSW__
14381438
// it does have common implementation but not for MSW which has its own
14391439
// native version of it
1440-
= 0
1441-
#endif // __WXMSW__
1440+
// CIB = 0
1441+
// CIB #endif // __WXMSW__
14421442
;
14431443

14441444
#endif // wxUSE_DRAG_AND_DROP

0 commit comments

Comments
 (0)