OGL samples again buildable after deprecated/setup.h turned off by default. Minor cleaning where applicable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -877,6 +877,9 @@ void csCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys))
|
||||
|
||||
if (palette->GetSelection() == PALETTE_TEXT_TOOL)
|
||||
{
|
||||
wxString newLabel;
|
||||
|
||||
#if wxUSE_WX_RESOURCES
|
||||
// Ask for a label and create a new free-floating text region
|
||||
csLabelEditingDialog* dialog = new csLabelEditingDialog(GetParent());
|
||||
|
||||
@@ -888,8 +891,9 @@ void csCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys))
|
||||
return;
|
||||
}
|
||||
|
||||
wxString newLabel = dialog->GetShapeLabel();
|
||||
newLabel = dialog->GetShapeLabel();
|
||||
dialog->Destroy();
|
||||
#endif // wxUSE_WX_RESOURCES
|
||||
|
||||
wxShape* shape = new csTextBoxShape;
|
||||
shape->AssignNewIds();
|
||||
|
Reference in New Issue
Block a user