10#include <wx/artprov.h>
11#include <wx/xrc/xmlres.h>
15#include <wx/stattext.h>
19#include <wx/settings.h>
20#include <wx/listbox.h>
23#include <wx/textctrl.h>
24#include <wx/radiobut.h>
25#include <wx/statbox.h>
26#include <wx/splitter.h>
53 virtual void OnClose( wxCloseEvent& event ) {
event.Skip(); }
56 virtual void OnApply( wxCommandEvent& event ) {
event.Skip(); }
57 virtual void OnCancel( wxCommandEvent& event ) {
event.Skip(); }
65 DIALOG_KICAD_MERGE_3WAY_BASE( wxWindow* parent, wxWindowID
id = wxID_ANY,
const wxString& title =
_(
"Resolve Merge Conflicts"),
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxSize( 950,700 ),
long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
wxButton * m_sdbSizerApply
virtual void OnResolutionChanged(wxCommandEvent &event)
wxRadioButton * m_radioTheirs
wxStdDialogButtonSizer * m_sdbSizer
wxRadioButton * m_radioAncestor
wxStaticText * m_labelIntro
wxPanel * m_panelConflicts
wxStaticText * m_labelConflicts
virtual void OnClose(wxCloseEvent &event)
wxSplitterWindow * m_splitter
virtual void OnConflictSelected(wxCommandEvent &event)
wxButton * m_sdbSizerCancel
virtual void OnCancel(wxCommandEvent &event)
~DIALOG_KICAD_MERGE_3WAY_BASE()
void m_splitterOnIdle(wxIdleEvent &)
wxRadioButton * m_radioOurs
wxStaticText * m_labelDetail
wxListBox * m_listConflicts
DIALOG_KICAD_MERGE_3WAY_BASE(wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("Resolve Merge Conflicts"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(950, 700), long style=wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
wxTextCtrl * m_textDetail
virtual void OnApply(wxCommandEvent &event)
wxPanel * m_panelResolution
DIALOG_SHIM(wxWindow *aParent, wxWindowID id, const wxString &title, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER, const wxString &name=wxDialogNameStr)