Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
magicseteditor
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
magicseteditor
Commits
e18faefd
Commit
e18faefd
authored
Dec 24, 2006
by
twanvl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed crash in drop down list when switching between editors
parent
35f766f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
src/gui/drop_down_list.cpp
src/gui/drop_down_list.cpp
+1
-2
src/gui/value/choice.cpp
src/gui/value/choice.cpp
+1
-1
No files found.
src/gui/drop_down_list.cpp
View file @
e18faefd
...
@@ -37,10 +37,8 @@ class DropDownHider : public wxEvtHandler {
...
@@ -37,10 +37,8 @@ class DropDownHider : public wxEvtHandler {
// don't just use ev.Skip(), because this event handler will be removed by hiding,
// don't just use ev.Skip(), because this event handler will be removed by hiding,
// so there will be no next handler to skip to
// so there will be no next handler to skip to
wxEvtHandler
*
nh
=
GetNextHandler
();
wxEvtHandler
*
nh
=
GetNextHandler
();
wxLogDebug
(
L"close to %p"
,
nh
);
list
.
hide
(
false
);
list
.
hide
(
false
);
if
(
nh
)
nh
->
ProcessEvent
(
ev
);
if
(
nh
)
nh
->
ProcessEvent
(
ev
);
wxLogDebug
(
L"/close to %p"
,
nh
);
return
false
;
return
false
;
}
else
{
}
else
{
// if (t !=10093 && t !=10098 && t !=10097 && t !=10099 && t !=10004 && t !=10062
// if (t !=10093 && t !=10098 && t !=10097 && t !=10099 && t !=10004 && t !=10062
...
@@ -80,6 +78,7 @@ DropDownList::DropDownList(Window* parent, bool is_submenu, ValueViewer* viewer)
...
@@ -80,6 +78,7 @@ DropDownList::DropDownList(Window* parent, bool is_submenu, ValueViewer* viewer)
}
}
DropDownList
::~
DropDownList
()
{
DropDownList
::~
DropDownList
()
{
realHide
();
// restore event handler before deleting it
delete
hider
;
delete
hider
;
}
}
...
...
src/gui/value/choice.cpp
View file @
e18faefd
...
@@ -54,7 +54,7 @@ void ChoiceThumbnailRequest::store(const Image& img) {
...
@@ -54,7 +54,7 @@ void ChoiceThumbnailRequest::store(const Image& img) {
#ifdef __WXMSW__
#ifdef __WXMSW__
// for some reason windows doesn't like completely transparent images if they do not have a mask
// for some reason windows doesn't like completely transparent images if they do not have a mask
// HACK:
// HACK:
if
(
img
.
GetWidth
()
==
16
&&
img
.
GetHeight
()
==
16
)
{
if
(
img
.
HasAlpha
()
&&
img
.
GetWidth
()
==
16
&&
img
.
GetHeight
()
==
16
)
{
// is the image empty?
// is the image empty?
bool
empty
=
true
;
bool
empty
=
true
;
int
*
b
=
(
int
*
)
img
.
GetAlpha
();
int
*
b
=
(
int
*
)
img
.
GetAlpha
();
...
...
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