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
37d2057b
Commit
37d2057b
authored
Feb 10, 2009
by
dickelbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove flashing/redrawing of text edit dialog
parent
078490db
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
41 additions
and
11 deletions
+41
-11
dialog_edit_label.cpp
eeschema/dialog_edit_label.cpp
+19
-1
dialog_edit_label.h
eeschema/dialog_edit_label.h
+20
-4
dialog_edit_label_base.cpp
eeschema/dialog_edit_label_base.cpp
+0
-2
dialog_edit_label_base.fbp
eeschema/dialog_edit_label_base.fbp
+1
-1
dialog_edit_label_base.h
eeschema/dialog_edit_label_base.h
+0
-1
edit_label.cpp
eeschema/edit_label.cpp
+1
-2
No files found.
eeschema/dialog_edit_label.cpp
View file @
37d2057b
...
...
@@ -17,6 +17,24 @@
#include "general.h"
#include "dialog_edit_label.h"
int
DialogLabelEditor
::
ShowModally
(
WinEDA_SchematicFrame
*
parent
,
SCH_TEXT
*
CurrentText
)
{
int
ret
;
DialogLabelEditor
*
dialog
=
new
DialogLabelEditor
(
parent
,
CurrentText
);
// doing any post construction resizing is better done here than in
// OnInitDialog() since it tends to flash/redraw the dialog less.
dialog
->
init
();
ret
=
dialog
->
ShowModal
();
dialog
->
Destroy
();
return
ret
;
}
DialogLabelEditor
::
DialogLabelEditor
(
WinEDA_SchematicFrame
*
parent
,
SCH_TEXT
*
CurrentText
)
:
DialogLabelEditor_Base
(
parent
)
{
...
...
@@ -25,7 +43,7 @@ DialogLabelEditor::DialogLabelEditor( WinEDA_SchematicFrame* parent, SCH_TEXT* C
}
void
DialogLabelEditor
::
OnInitDialog
(
wxInitDialogEvent
&
event
)
void
DialogLabelEditor
::
init
(
)
{
wxString
msg
;
...
...
eeschema/dialog_edit_label.h
View file @
37d2057b
...
...
@@ -10,19 +10,35 @@
#include "dialog_edit_label_base.h"
class
DialogLabelEditor
:
public
DialogLabelEditor_Base
class
DialogLabelEditor
:
public
DialogLabelEditor_Base
{
private
:
WinEDA_SchematicFrame
*
m_Parent
;
SCH_TEXT
*
m_CurrentText
;
public
:
void
init
();
protected
:
// these are protected so that the static ShowModally() gets used.
DialogLabelEditor
(
WinEDA_SchematicFrame
*
parent
,
SCH_TEXT
*
CurrentText
);
~
DialogLabelEditor
(){};
public
:
/**
* Function ShowModally
* is a static function that constructs and then displays one of these dialogs.
* @param parent
* @param CurrentText is one of several classes derived from SCH_TEXT
* @return int - the result Dialog::ShowModal()
*/
static
int
ShowModally
(
WinEDA_SchematicFrame
*
parent
,
SCH_TEXT
*
CurrentText
);
private
:
void
OnInitDialog
(
wxInitDialogEvent
&
event
);
void
OnButtonOKClick
(
wxCommandEvent
&
event
);
void
OnButtonCANCEL_Click
(
wxCommandEvent
&
event
);
void
OnButtonOKClick
(
wxCommandEvent
&
event
);
void
OnButtonCANCEL_Click
(
wxCommandEvent
&
event
);
void
TextPropertiesAccept
(
wxCommandEvent
&
event
);
};
...
...
eeschema/dialog_edit_label_base.cpp
View file @
37d2057b
...
...
@@ -82,7 +82,6 @@ DialogLabelEditor_Base::DialogLabelEditor_Base( wxWindow* parent, wxWindowID id,
this
->
Layout
();
// Connect Events
this
->
Connect
(
wxEVT_INIT_DIALOG
,
wxInitDialogEventHandler
(
DialogLabelEditor_Base
::
OnInitDialog
)
);
m_buttonOK
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DialogLabelEditor_Base
::
OnButtonOKClick
),
NULL
,
this
);
m_buttonCANCEL
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DialogLabelEditor_Base
::
OnButtonCANCEL_Click
),
NULL
,
this
);
}
...
...
@@ -90,7 +89,6 @@ DialogLabelEditor_Base::DialogLabelEditor_Base( wxWindow* parent, wxWindowID id,
DialogLabelEditor_Base
::~
DialogLabelEditor_Base
()
{
// Disconnect Events
this
->
Disconnect
(
wxEVT_INIT_DIALOG
,
wxInitDialogEventHandler
(
DialogLabelEditor_Base
::
OnInitDialog
)
);
m_buttonOK
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DialogLabelEditor_Base
::
OnButtonOKClick
),
NULL
,
this
);
m_buttonCANCEL
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DialogLabelEditor_Base
::
OnButtonCANCEL_Click
),
NULL
,
this
);
}
eeschema/dialog_edit_label_base.fbp
View file @
37d2057b
...
...
@@ -53,7 +53,7 @@
<event
name=
"OnHibernate"
></event>
<event
name=
"OnIconize"
></event>
<event
name=
"OnIdle"
></event>
<event
name=
"OnInitDialog"
>
OnInitDialog
</event>
<event
name=
"OnInitDialog"
></event>
<event
name=
"OnKeyDown"
></event>
<event
name=
"OnKeyUp"
></event>
<event
name=
"OnKillFocus"
></event>
...
...
eeschema/dialog_edit_label_base.h
View file @
37d2057b
...
...
@@ -50,7 +50,6 @@ class DialogLabelEditor_Base : public wxDialog
wxButton
*
m_buttonCANCEL
;
// Virtual event handlers, overide them in your derived class
virtual
void
OnInitDialog
(
wxInitDialogEvent
&
event
){
event
.
Skip
();
}
virtual
void
OnButtonOKClick
(
wxCommandEvent
&
event
){
event
.
Skip
();
}
virtual
void
OnButtonCANCEL_Click
(
wxCommandEvent
&
event
){
event
.
Skip
();
}
...
...
eeschema/edit_label.cpp
View file @
37d2057b
...
...
@@ -137,8 +137,7 @@ void WinEDA_SchematicFrame::EditSchematicText( SCH_TEXT* TextStruct,
DrawPanel
->
CursorOff
(
DC
);
RedrawOneStruct
(
DrawPanel
,
DC
,
TextStruct
,
g_XorMode
);
DialogLabelEditor
*
dialog
=
new
DialogLabelEditor
(
this
,
TextStruct
);
dialog
->
ShowModal
();
dialog
->
Destroy
();
DialogLabelEditor
::
ShowModally
(
this
,
TextStruct
);
RedrawOneStruct
(
DrawPanel
,
DC
,
TextStruct
,
GR_DEFAULT_DRAWMODE
);
DrawPanel
->
CursorOn
(
DC
);
...
...
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