Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
fe54ceac
Commit
fe54ceac
authored
Nov 03, 2013
by
Wayne Stambaugh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix debug builds on wxWidgets 2.8.
parent
e9f41a3b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
5 deletions
+6
-5
.bzrignore
.bzrignore
+1
-0
cairo_compositor.cpp
common/gal/cairo/cairo_compositor.cpp
+1
-1
cairo_gal.cpp
common/gal/cairo/cairo_gal.cpp
+1
-1
gpu_manager.cpp
common/gal/opengl/gpu_manager.cpp
+1
-1
item_state.h
pcbnew/tools/item_state.h
+2
-2
No files found.
.bzrignore
View file @
fe54ceac
...
@@ -5,6 +5,7 @@ common/netlist_lexer.h
...
@@ -5,6 +5,7 @@ common/netlist_lexer.h
common/pcb_plot_params_lexer.h
common/pcb_plot_params_lexer.h
common/page_layout/page_layout_reader_keywords.cpp
common/page_layout/page_layout_reader_keywords.cpp
common/fp_lib_table_keywords.*
common/fp_lib_table_keywords.*
common/gal/opengl/shader_src.h
include/fp_lib_table_lexer.h
include/fp_lib_table_lexer.h
include/netlist_lexer.h
include/netlist_lexer.h
include/page_layout_reader_lexer.h
include/page_layout_reader_lexer.h
...
...
common/gal/cairo/cairo_compositor.cpp
View file @
fe54ceac
...
@@ -78,7 +78,7 @@ unsigned int CAIRO_COMPOSITOR::CreateBuffer()
...
@@ -78,7 +78,7 @@ unsigned int CAIRO_COMPOSITOR::CreateBuffer()
cairo_t
*
context
=
cairo_create
(
surface
);
cairo_t
*
context
=
cairo_create
(
surface
);
#ifdef __WXDEBUG__
#ifdef __WXDEBUG__
cairo_status_t
status
=
cairo_status
(
context
);
cairo_status_t
status
=
cairo_status
(
context
);
wxASSERT_MSG
(
status
==
CAIRO_STATUS_SUCCESS
,
"Cairo context creation error"
);
wxASSERT_MSG
(
status
==
CAIRO_STATUS_SUCCESS
,
wxT
(
"Cairo context creation error"
)
);
#endif
/* __WXDEBUG__ */
#endif
/* __WXDEBUG__ */
// Set default settings for the buffer
// Set default settings for the buffer
...
...
common/gal/cairo/cairo_gal.cpp
View file @
fe54ceac
...
@@ -959,7 +959,7 @@ void CAIRO_GAL::initSurface()
...
@@ -959,7 +959,7 @@ void CAIRO_GAL::initSurface()
context
=
cairo_create
(
surface
);
context
=
cairo_create
(
surface
);
#ifdef __WXDEBUG__
#ifdef __WXDEBUG__
cairo_status_t
status
=
cairo_status
(
context
);
cairo_status_t
status
=
cairo_status
(
context
);
wxASSERT_MSG
(
status
==
CAIRO_STATUS_SUCCESS
,
"Cairo context creation error"
);
wxASSERT_MSG
(
status
==
CAIRO_STATUS_SUCCESS
,
wxT
(
"Cairo context creation error"
)
);
#endif
/* __WXDEBUG__ */
#endif
/* __WXDEBUG__ */
currentContext
=
context
;
currentContext
=
context
;
...
...
common/gal/opengl/gpu_manager.cpp
View file @
fe54ceac
...
@@ -46,7 +46,7 @@ GPU_MANAGER* GPU_MANAGER::MakeManager( VERTEX_CONTAINER* aContainer )
...
@@ -46,7 +46,7 @@ GPU_MANAGER* GPU_MANAGER::MakeManager( VERTEX_CONTAINER* aContainer )
else
if
(
typeid
(
*
aContainer
)
==
typeid
(
NONCACHED_CONTAINER
)
)
else
if
(
typeid
(
*
aContainer
)
==
typeid
(
NONCACHED_CONTAINER
)
)
return
new
GPU_NONCACHED_MANAGER
(
aContainer
);
return
new
GPU_NONCACHED_MANAGER
(
aContainer
);
wxASSERT_MSG
(
false
,
"Not handled container type"
);
wxASSERT_MSG
(
false
,
wxT
(
"Not handled container type"
)
);
return
NULL
;
return
NULL
;
}
}
...
...
pcbnew/tools/item_state.h
View file @
fe54ceac
...
@@ -55,8 +55,8 @@ public:
...
@@ -55,8 +55,8 @@ public:
void
Save
(
BOARD_ITEM
*
aItem
)
void
Save
(
BOARD_ITEM
*
aItem
)
{
{
#ifdef __WXDEBUG__
#ifdef __WXDEBUG__
wxASSERT_MSG
(
m_canSave
,
"You cannot save items after issuing commands.
"
wxASSERT_MSG
(
m_canSave
,
wxT
(
"You cannot save items after issuing commands. You have
"
"You have either RestoreAll() or Apply() before adding items!"
);
"either RestoreAll() or Apply() before adding items!"
)
);
#endif
#endif
m_items
.
push_back
(
aItem
);
m_items
.
push_back
(
aItem
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment