AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lots of cleanup, mostly consolidating globals

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 2002-01-09 23:16:22 +00:00
parent e297d36e02
commit 511ac294da
18 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/os2/button.h
View File

@ -14,8 +14,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
// Pushbutton // Pushbutton
class WXDLLEXPORT wxButton: public wxButtonBase class WXDLLEXPORT wxButton: public wxButtonBase
{ {

1
include/wx/os2/checkbox.h
View File

@ -13,7 +13,6 @@
#define _WX_CHECKBOX_H_ #define _WX_CHECKBOX_H_
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLEXPORT wxBitmap; class WXDLLEXPORT wxBitmap;

2
include/wx/os2/choice.h
View File

@ -12,8 +12,6 @@
#ifndef _WX_CHOICE_H_ #ifndef _WX_CHOICE_H_
#define _WX_CHOICE_H_ #define _WX_CHOICE_H_
WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
// Choice item // Choice item
class WXDLLEXPORT wxChoice: public wxChoiceBase class WXDLLEXPORT wxChoice: public wxChoiceBase
{ {

3
include/wx/os2/combobox.h
View File

@ -16,9 +16,6 @@
#if wxUSE_COMBOBOX #if wxUSE_COMBOBOX
WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
// Combobox item // Combobox item
class WXDLLEXPORT wxComboBox : public wxChoice class WXDLLEXPORT wxComboBox : public wxChoice
{ {

2
include/wx/os2/control.h
View File

@ -14,8 +14,6 @@
#include "wx/dynarray.h" #include "wx/dynarray.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
// General item class // General item class
class WXDLLEXPORT wxControl : public wxControlBase class WXDLLEXPORT wxControl : public wxControlBase
{ {

1
include/wx/os2/font.h
View File

@ -107,6 +107,7 @@ public:
// //
// For internal use only! // For internal use only!
// //
void SetPS(HPS hPS);
void SetFM( PFONTMETRICS pFM void SetFM( PFONTMETRICS pFM
,int nNumFonts ,int nNumFonts
); );

2
include/wx/os2/gauge.h
View File

@ -14,8 +14,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
class WXDLLEXPORT wxGauge: public wxControl class WXDLLEXPORT wxGauge: public wxControl
{ {
public: public:

3
include/wx/os2/mdi.h
View File

@ -16,9 +16,6 @@
#include "wx/frame.h" #include "wx/frame.h"
WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMDIChildFrame; class WXDLLEXPORT wxMDIChildFrame;

2
include/wx/os2/msgdlg.h
View File

@ -20,8 +20,6 @@
* Message box dialog * Message box dialog
*/ */
WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
class WXDLLEXPORT wxMessageDialog : public wxDialog class WXDLLEXPORT wxMessageDialog : public wxDialog
{ {
DECLARE_DYNAMIC_CLASS(wxMessageDialog) DECLARE_DYNAMIC_CLASS(wxMessageDialog)

58
include/wx/os2/private.h
View File

@ -43,6 +43,64 @@ static const double twips2mm = (1/(METRIC_CONVERSION_CONSTANT*1440));
static const double mm2pt = (METRIC_CONVERSION_CONSTANT*72); static const double mm2pt = (METRIC_CONVERSION_CONSTANT*72);
static const double pt2mm = (1/(METRIC_CONVERSION_CONSTANT*72)); static const double pt2mm = (1/(METRIC_CONVERSION_CONSTANT*72));
//
// Constant strings for control names and classes
//
//
// Controls
//
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxMultiTextNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxBitmapRadioButtonNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlWindowNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxVirtListBoxNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxEnhDialogNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxFatalErrorStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxTreeCtrlNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
//
// Class names
//
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameClassName;
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameClassNameNoRedraw;
WXDLLEXPORT_DATA(extern const wxChar*) wxMDIFrameClassName;
WXDLLEXPORT_DATA(extern const wxChar*) wxMDIFrameClassNameNoRedraw;
WXDLLEXPORT_DATA(extern const wxChar*) wxMDIChildFrameClassName;
WXDLLEXPORT_DATA(extern const wxChar*) wxMDIChildFrameClassNameNoRedraw;
WXDLLEXPORT_DATA(extern const wxChar*) wxPanelClassName;
WXDLLEXPORT_DATA(extern const wxChar*) wxPanelClassNameNR;
WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasClassName;
WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasClassNameNR;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// standard icons from the resources // standard icons from the resources
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

2
include/wx/os2/radiobox.h
View File

@ -12,8 +12,6 @@
#ifndef _WX_RADIOBOX_H_ #ifndef _WX_RADIOBOX_H_
#define _WX_RADIOBOX_H_ #define _WX_RADIOBOX_H_
WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
// List box item // List box item
class WXDLLEXPORT wxBitmap ; class WXDLLEXPORT wxBitmap ;

2
include/wx/os2/radiobut.h
View File

@ -14,8 +14,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
class WXDLLEXPORT wxRadioButton: public wxControl class WXDLLEXPORT wxRadioButton: public wxControl
{ {
public: public:

2
include/wx/os2/scrolbar.h
View File

@ -14,8 +14,6 @@
#include "wx/scrolbar.h" #include "wx/scrolbar.h"
WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
// Scrollbar item // Scrollbar item
class WXDLLEXPORT wxScrollBar: public wxScrollBarBase class WXDLLEXPORT wxScrollBar: public wxScrollBarBase
{ {

2
include/wx/os2/slider.h
View File

@ -14,8 +14,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
// Slider // Slider
class WXDLLEXPORT wxSlider: public wxSliderBase class WXDLLEXPORT wxSlider: public wxSliderBase
{ {

2
include/wx/os2/statbmp.h
View File

@ -19,8 +19,6 @@
#include "wx/control.h" #include "wx/control.h"
#include "wx/icon.h" #include "wx/icon.h"
WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
{ {
public: public:

2
include/wx/os2/statbox.h
View File

@ -14,8 +14,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
// Group box // Group box
class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
{ {

2
include/wx/os2/stattext.h
View File

@ -18,8 +18,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
class WXDLLEXPORT wxStaticText : public wxStaticTextBase class WXDLLEXPORT wxStaticText : public wxStaticTextBase
{ {
public: public:

2
include/wx/os2/toolbar.h
View File

@ -15,8 +15,6 @@
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
#include "wx/tbarbase.h" #include "wx/tbarbase.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
class WXDLLEXPORT wxToolBar: public wxToolBarBase class WXDLLEXPORT wxToolBar: public wxToolBarBase
{ {
public: public: