Added makeg295.env file for building with gcc-2.95/mingw

[wxWidgets.git] / src / os2 / dialog.cpp

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index bf3cae5e352be74e0494d910408c79df3bdbac97..f15bd2b353f3cfa742f0742579ceaacdfa15954f 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -55,7 +55,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
   SetName(name);
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
   SetName(name);

-  
+

   if (!parent)
     wxTopLevelWindows.Append(this);
 
   if (!parent)
     wxTopLevelWindows.Append(this);
 


@@ -78,7 +78,7 @@ void wxDialog::SetModal(bool flag)
        else
                if ( m_windowStyle & wxDIALOG_MODAL )
                        m_windowStyle -= wxDIALOG_MODAL ;
        else
                if ( m_windowStyle & wxDIALOG_MODAL )
                        m_windowStyle -= wxDIALOG_MODAL ;

-  
+

   wxModelessWindows.DeleteObject(this);
   if (!flag)
     wxModelessWindows.Append(this);
   wxModelessWindows.DeleteObject(this);
   if (!flag)
     wxModelessWindows.Append(this);


@@ -132,11 +132,6 @@ bool wxDialog::IsIconized() const
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxDialog::SetClientSize(int width, int height)
-{
-    // TODO
-}
-

 void wxDialog::GetPosition(int *x, int *y) const
 {
     // TODO
 void wxDialog::GetPosition(int *x, int *y) const
 {
     // TODO


@@ -254,12 +249,12 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 
     static wxList closing;
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 
     static wxList closing;

-    
+

     if ( closing.Member(this) )
         return;
     if ( closing.Member(this) )
         return;

-    
+

     closing.Append(this);
     closing.Append(this);

-    
+

     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog