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

In DialogEd, changed Close to Destroy to make it shut down properly.

Browse Source 
Various Motif fixes incl. fixing window colours, menu fonts/colours, dialog box


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-18 14:40:38 +00:00
parent 358fc25cc3
commit 94b49b9303
31 changed files with 466 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/dialoged/src/reseditr.cpp
View File

@@ -2117,8 +2117,8 @@ void wxResourceEditorFrame::OnSaveAs(wxCommandEvent& WXUNUSED(event))
void wxResourceEditorFrame::OnExit(wxCommandEvent& WXUNUSED(event))
{
manager->Clear(TRUE, FALSE) ;
this->Close();
manager->Clear(TRUE, FALSE) ;
this->Destroy();
}
void wxResourceEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))

22
utils/dialoged/src/winprop.cpp
View File

@@ -1371,13 +1371,13 @@ wxProperty *wxRadioBoxPropertyInfo::GetProperty(wxString& name)
if (name == "orientation")
{
wxString orient;
if (m_propertyWindow->GetWindowStyleFlag() & wxRA_HORIZONTAL)
orient = "wxRA_HORIZONTAL";
if (m_propertyWindow->GetWindowStyleFlag() & wxRA_SPECIFY_COLS)
orient = "wxRA_SPECIFY_COLS";
else
orient = "wxRA_VERTICAL";
orient = "wxRA_SPECIFY_ROWS";
return new wxProperty("orientation", orient, "string",
new wxStringListValidator(new wxStringList("wxRA_HORIZONTAL", "wxRA_VERTICAL",
new wxStringListValidator(new wxStringList("wxRA_SPECIFY_COLS", "wxRA_SPECIFY_ROWS",
NULL)));
}
else if (name == "values")
@@ -1405,17 +1405,17 @@ bool wxRadioBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
long windowStyle = radioBox->GetWindowStyleFlag();
wxString val(property->GetValue().StringValue());
if (val == "wxRA_HORIZONTAL")
if (val == "wxRA_SPECIFY_COLS")
{
if (windowStyle & wxRA_VERTICAL)
windowStyle -= wxRA_VERTICAL;
windowStyle |= wxRA_HORIZONTAL;
if (windowStyle & wxRA_SPECIFY_ROWS)
windowStyle -= wxRA_SPECIFY_ROWS;
windowStyle |= wxRA_SPECIFY_COLS;
}
else
{
if (windowStyle & wxRA_HORIZONTAL)
windowStyle -= wxRA_HORIZONTAL;
windowStyle |= wxRA_VERTICAL;
if (windowStyle & wxRA_SPECIFY_COLS)
windowStyle -= wxRA_SPECIFY_COLS;
windowStyle |= wxRA_SPECIFY_ROWS;
}
radioBox->SetWindowStyleFlag(windowStyle);
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(radioBox);

2
utils/dialoged/src/winstyle.cpp
View File

@@ -97,6 +97,8 @@ int g_WindowStylesRadioButtonCount = sizeof(g_WindowStylesRadioButton)/sizeof(wx
/* wxRadioBox */
static wxWindowStylePair g_WindowStylesRadioBox[] = {
{ "wxRA_SPECIFY_COLS", wxRA_SPECIFY_COLS },
{ "wxRA_SPECIFY_ROWS", wxRA_SPECIFY_ROWS },
{ "wxRA_HORIZONTAL", wxRA_HORIZONTAL },
{ "wxRA_VERTICAL", wxRA_VERTICAL }
};