don't try to remove -g flag from CFLAGS, it is not necessary and doesn't work correct...

[wxWidgets.git] / contrib / samples / applet / combobox.cpp

diff --git a/contrib/samples/applet/combobox.cpp b/contrib/samples/applet/combobox.cpp
index d828fda449b74d53c7efca32a710dfada5499ed2..4214c41c0f9e11ddf4fbe570e10fc06502630d4e 100644 (file)
--- a/contrib/samples/applet/combobox.cpp
+++ b/contrib/samples/applet/combobox.cpp
@@ -2,22 +2,21 @@
 *
 *                       wxWindows HTML Applet Package
 *
 *
 *                       wxWindows HTML Applet Package
 *

+*               Copyright (C) 1991-2001 SciTech Software, Inc.
+*                            All rights reserved.
+*

 *  ========================================================================
 *
 *  ========================================================================
 *

-*    The contents of this file are subject to the wxWindows licence; you
-*    may not use this file except in compliance with the License. You may
-*    obtain a copy of the License at http://www.wxwindows.org/licence.htm
+*    The contents of this file are subject to the wxWindows License
+*    Version 3.0 (the "License"); you may not use this file except in
+*    compliance with the License. You may obtain a copy of the License at
+*    http://www.wxwindows.org/licence3.txt

 *
 *    Software distributed under the License is distributed on an
 *    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
 *    implied. See the License for the specific language governing
 *    rights and limitations under the License.
 *
 *
 *    Software distributed under the License is distributed on an
 *    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
 *    implied. See the License for the specific language governing
 *    rights and limitations under the License.
 *

-*    The Original Code is Copyright (C) 2001 SciTech Software, Inc.
-*
-*    The Initial Developer of the Original Code is SciTech Software, Inc.
-*    All Rights Reserved.
-*

 *  ========================================================================
 *
 * Language:     ANSI C++
 *  ========================================================================
 *
 * Language:     ANSI C++


@@ -29,10 +28,12 @@
 ****************************************************************************/
 
 // For compilers that support precompilation, includes "wx/wx.h".
 ****************************************************************************/
 
 // For compilers that support precompilation, includes "wx/wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif

+
+#include "wx/wx.h"

 #include "combobox.h"
 
 /*------------------------- Implementation --------------------------------*/
 #include "combobox.h"
 
 /*------------------------- Implementation --------------------------------*/


@@ -75,7 +76,7 @@ void ComboBox::Select(int n)
     m_ListBox->Select(n);
     m_TextCtrl->SetValue(GetStringSelection());
 }
     m_ListBox->Select(n);
     m_TextCtrl->SetValue(GetStringSelection());
 }

-    
+

 void ComboBox::Deselect(int n)
 {
     m_ListBox->Deselect(n);
 void ComboBox::Deselect(int n)
 {
     m_ListBox->Deselect(n);


@@ -84,7 +85,7 @@ void ComboBox::Deselect(int n)
 void ComboBox::Insert(const wxString& item, int pos)
 {
     m_ListBox->Insert(item,pos);
 void ComboBox::Insert(const wxString& item, int pos)
 {
     m_ListBox->Insert(item,pos);

-}   
+}

 
 void ComboBox::Insert(const wxString& item, int pos, void *clientData)
 {
 
 void ComboBox::Insert(const wxString& item, int pos, void *clientData)
 {


@@ -128,13 +129,13 @@ void ComboBox::SetFirstItem(int n)
     m_ListBox->SetFirstItem(n);
     m_TextCtrl->SetValue(GetStringSelection());
 }
     m_ListBox->SetFirstItem(n);
     m_TextCtrl->SetValue(GetStringSelection());
 }

-        
+

 void ComboBox::SetFirstItem(const wxString &s)
 {
     m_ListBox->SetFirstItem(s);
     m_TextCtrl->SetValue(GetStringSelection());
 }
 void ComboBox::SetFirstItem(const wxString &s)
 {
     m_ListBox->SetFirstItem(s);
     m_TextCtrl->SetValue(GetStringSelection());
 }

-    
+

 void ComboBox::Append(const wxString &item)
 {
     m_ListBox->Append(item);
 void ComboBox::Append(const wxString &item)
 {
     m_ListBox->Append(item);


@@ -153,12 +154,12 @@ void ComboBox::Append(const wxString& item, wxClientData *clientData)
     m_TextCtrl->SetValue(GetStringSelection());
 }
 
     m_TextCtrl->SetValue(GetStringSelection());
 }
 

-void ComboBox::Clear()  
+void ComboBox::Clear()

 {
     m_ListBox->Clear();
     m_TextCtrl->SetValue(GetStringSelection());
 }
 {
     m_ListBox->Clear();
     m_TextCtrl->SetValue(GetStringSelection());
 }

-        
+

 void ComboBox::Delete(int n)
 {
     m_ListBox->Delete(n);
 void ComboBox::Delete(int n)
 {
     m_ListBox->Delete(n);