Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed various wxMSW compile problems that came down the telephone line...

Browse Source 
plus wxTreeCtrl::EditLabel/EndEditLabel, dialog editor stuff, wxMSW header changes,
doc changes. Sorry about the quantity :-(


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-08-07 23:52:45 +00:00
parent c2d8daeb4a
commit bbcdf8bc7c
110 changed files with 1009 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
utils/wxprop/src/proplist.cpp
View File

@@ -396,7 +396,7 @@ bool wxPropertyListView::CreateControls(void)
{
wxPanel *panel = (wxPanel *)propertyWindow;
int largeButtonWidth = 50;
int largeButtonWidth = 60;
int largeButtonHeight = 25;
int smallButtonWidth = 25;
@@ -424,11 +424,17 @@ bool wxPropertyListView::CreateControls(void)
wxSystemSettings settings;
wxFont guiFont = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
#ifdef __WXMSW__
wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxDEFAULT, wxNORMAL, wxNORMAL, FALSE, "Courier New");
#else
wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL);
#endif
// May need to be changed in future to eliminate clashes with app.
panel->SetClientData((char *)this);
// These buttons are at the bottom of the window, but create them now
// so the constraints are evaluated in the correct order
if (buttonFlags & wxPROP_BUTTON_OK)
{
windowCloseButton = new wxButton(panel, wxID_OK, "OK",
@@ -436,7 +442,7 @@ bool wxPropertyListView::CreateControls(void)
windowCloseButton->SetDefault();
windowCloseButton->SetFocus();
}
if (buttonFlags & wxPROP_BUTTON_CLOSE)
else if (buttonFlags & wxPROP_BUTTON_CLOSE)
{
windowCloseButton = new wxButton(panel, wxID_OK, "Close",
wxPoint(-1, -1), wxSize(largeButtonWidth, largeButtonHeight));
@@ -455,8 +461,9 @@ bool wxPropertyListView::CreateControls(void)
if (windowCloseButton)
{
wxLayoutConstraints *c1 = new wxLayoutConstraints;
c1->left.SameAs (panel, wxLeft, 2);
c1->top.SameAs (panel, wxTop, 2);
c1->bottom.SameAs (panel, wxBottom, 2);
c1->width.AsIs();
c1->height.AsIs();
windowCloseButton->SetConstraints(c1);
@@ -465,12 +472,9 @@ bool wxPropertyListView::CreateControls(void)
if (windowCancelButton)
{
wxLayoutConstraints *c2 = new wxLayoutConstraints;
if (leftMostWindow == panel)
c2->left.SameAs (panel, wxLeft, 2);
else
c2->left.RightOf (leftMostWindow, 2);
c2->top.SameAs (panel, wxTop, 2);
c2->right.SameAs (panel, wxRight, 2);
c2->bottom.SameAs (panel, wxBottom, 2);
c2->width.AsIs();
c2->height.AsIs();
windowCancelButton->SetConstraints(c2);
@@ -484,7 +488,7 @@ bool wxPropertyListView::CreateControls(void)
else
c2->left.RightOf (leftMostWindow, 2);
c2->top.SameAs (panel, wxTop, 2);
c2->bottom.SameAs (panel, wxBottom, 2);
c2->width.AsIs();
c2->height.AsIs();
windowHelpButton->SetConstraints(c2);
@@ -530,9 +534,11 @@ bool wxPropertyListView::CreateControls(void)
wxLayoutConstraints *c = new wxLayoutConstraints;
c->left.SameAs (panel, wxLeft, 2);
/*
if (windowCloseButton)
c->top.Below (windowCloseButton, 2);
else
*/
c->top.SameAs (panel, wxTop, 2);
c->width.AsIs();
@@ -559,9 +565,11 @@ bool wxPropertyListView::CreateControls(void)
editButton->Enable(FALSE);
wxLayoutConstraints *c = new wxLayoutConstraints;
/*
if (windowCloseButton)
c->top.Below (windowCloseButton, 2);
else
*/
c->top.SameAs (panel, wxTop, 2);
c->right.SameAs (panel, wxRight, 2);
@@ -579,10 +587,11 @@ bool wxPropertyListView::CreateControls(void)
c->left.RightOf (confirmButton, 2);
else
c->left.SameAs (panel, wxLeft, 2);
/*
if (windowCloseButton)
c->top.Below (windowCloseButton, 2);
else
*/
c->top.SameAs (panel, wxTop, 2);
if (editButton)
@@ -619,10 +628,15 @@ bool wxPropertyListView::CreateControls(void)
c->top.Below (valueList, 2);
c->right.SameAs (panel, wxRight, 2);
c->bottom.SameAs (panel, wxBottom, 2);
if (windowCloseButton)
c->bottom.Above (windowCloseButton, -2);
else
c->bottom.SameAs (panel, wxBottom, 2);
propertyScrollingList->SetConstraints(c);
// Note: if this is called now, it causes a GPF.
// Why?
// panel->Layout();
@@ -830,6 +844,10 @@ bool wxPropertyListDialog::ProcessEvent(wxEvent& event)
IMPLEMENT_CLASS(wxPropertyListPanel, wxPanel)
BEGIN_EVENT_TABLE(wxPropertyListPanel, wxPanel)
EVT_SIZE(wxPropertyListPanel::OnSize)
END_EVENT_TABLE()
void wxPropertyListPanel::OnDefaultAction(wxControl *item)
{
/*
@@ -847,6 +865,11 @@ bool wxPropertyListPanel::ProcessEvent(wxEvent& event)
return TRUE;
}
void wxPropertyListPanel::OnSize(wxSizeEvent& event)
{
Layout();
}
/*
* Property frame
*/
@@ -856,12 +879,18 @@ IMPLEMENT_CLASS(wxPropertyListFrame, wxFrame)
bool wxPropertyListFrame::OnClose(void)
{
if (view)
return view->OnClose();
{
if (propertyPanel)
propertyPanel->SetView(NULL);
view->OnClose();
view = NULL;
return TRUE;
}
else
return FALSE;
}
wxPanel *wxPropertyListFrame::OnCreatePanel(wxFrame *parent, wxPropertyListView *v)
wxPropertyListPanel *wxPropertyListFrame::OnCreatePanel(wxFrame *parent, wxPropertyListView *v)
{
return new wxPropertyListPanel(v, parent);
}

14
utils/wxprop/src/proplist.h
View File

@@ -303,8 +303,16 @@ class wxPropertyListPanel: public wxPanel
}
void OnDefaultAction(wxControl *item);
inline void SetView(wxPropertyListView* v) { view = v; }
inline wxPropertyListView* GetView() const { return view; }
// Extend event processing to search the view's event table
virtual bool ProcessEvent(wxEvent& event);
// Call Layout()
void OnSize(wxSizeEvent& event);
DECLARE_EVENT_TABLE()
};
/*
@@ -316,7 +324,7 @@ class wxPropertyListFrame: public wxFrame
DECLARE_CLASS(wxPropertyListFrame)
private:
wxPropertyListView *view;
wxPanel *propertyPanel;
wxPropertyListPanel *propertyPanel;
public:
wxPropertyListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -330,8 +338,8 @@ class wxPropertyListFrame: public wxFrame
// Must call this to create panel and associate view
virtual bool Initialize(void);
virtual wxPanel *OnCreatePanel(wxFrame *parent, wxPropertyListView *v);
inline virtual wxPanel *GetPropertyPanel(void) { return propertyPanel; }
virtual wxPropertyListPanel *OnCreatePanel(wxFrame *parent, wxPropertyListView *v);
inline virtual wxPropertyListPanel *GetPropertyPanel(void) { return propertyPanel; }
};
/*