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

Removed /install/gtk/configure from cvs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1998-08-05 16:33:18 +00:00
parent baeed2892d
commit 54ff4a701f
13 changed files with 127 additions and 6980 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/gtk/menu.h
View File

@ -49,13 +49,17 @@ public:
int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
wxMenuItem* FindMenuItemById( int id ) const;
void Check( int id, bool check );
bool Checked( int id ) const;
void Enable( int id, bool enable );
bool Enabled( int id ) const;
inline bool IsEnabled(int Id) const { return Enabled(Id); };
inline bool IsChecked(int Id) const { return Checked(Id); };
int GetMenuCount() const { return m_menus.Number(); }
wxMenu *GetMenu(int n) const { return (wxMenu *)m_menus.Nth(n)->Data(); }
bool IsChecked( int id ) const;
bool IsEnabled( int id ) const;
wxList m_menus;
GtkWidget *m_menubar;
};

10
include/wx/gtk1/menu.h
View File

@ -49,13 +49,17 @@ public:
int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
wxMenuItem* FindMenuItemById( int id ) const;
void Check( int id, bool check );
bool Checked( int id ) const;
void Enable( int id, bool enable );
bool Enabled( int id ) const;
inline bool IsEnabled(int Id) const { return Enabled(Id); };
inline bool IsChecked(int Id) const { return Checked(Id); };
int GetMenuCount() const { return m_menus.Number(); }
wxMenu *GetMenu(int n) const { return (wxMenu *)m_menus.Nth(n)->Data(); }
bool IsChecked( int id ) const;
bool IsEnabled( int id ) const;
wxList m_menus;
GtkWidget *m_menubar;
};

4
install/gtk/INSTALL
View File

@ -209,7 +209,7 @@ distribution is:
make distrib
NOTE: If you are in the base directory of wxGTK it will create
distribution packages for wxxt as well as for all packages in the
distribution packages for wxGTK as well as for all packages in the
user directory.
So if you want to create only packages for the files in user,
then go to the directory other and type:
@ -221,7 +221,7 @@ enter the specific directory and type there:
make distrib
All the distribution files will be put in the directory
distrib at the base of the wxxt-tree (where also configure
distrib at the base of the wxGTK-tree (where also configure
and template.mak can be found).
** Something about Makefile.in

6886
install/gtk/configure vendored
View File

File diff suppressed because it is too large Load Diff

98
install/gtk/configure.in
View File

@ -498,50 +498,6 @@ dnl ##########################
dnl # checks system services #
dnl ##########################
dnl ##### Threads #####
USE_THREADS=1
THREADS_LINK=""
UNIX_THREAD="gtk/threadno.cpp"
AC_ARG_WITH(threads,
[ --without-threads Force disabling threads ],
[USE_THREADS="$withval"])
if test "$USE_THREADS" = "1"; then
dnl For glibc 2 users who have the old libc 5 too
AC_CHECK_LIB(pthread-0.7, pthread_create, [
UNIX_THREAD="gtk/threadpsx.cpp"
THREADS_LINK="-lpthread-0.7"
AC_DEFINE(USE_THREADS)
],[
AC_CHECK_LIB(pthread, pthread_create, [
UNIX_THREAD="gtk/threadpsx.cpp"
THREADS_LINK="-lpthread"
AC_DEFINE(USE_THREADS)
])
])
AC_CHECK_LIB(pthreads, pthread_create, [
UNIX_THREAD="gtk/threadpsx.cpp"
THREADS_LINK="-lpthreads"
AC_DEFINE(USE_THREADS)
])
dnl Two levels
AC_CHECK_FUNC(sproc, [
AC_CHECK_HEADER(sys/prctl.h, [
UNIX_THREAD="gtk/threadsgi.cpp"
AC_DEFINE(USE_THREADS)
])
])
fi
AC_SUBST(UNIX_THREAD)
AC_SUBST(THREADS_LINK)
dnl defines UNIX_THREAD it contains the source file to use for threads. (GL)
dnl defines THREADS_LINK it contains the thread library to link with. (GL)
dnl defines USE_THREADS if thread support is activated. (GL)
AC_SYS_LONG_FILE_NAMES
dnl defines HAVE_LONG_FILENAMES if filenames longer then
dnl 14 chars are supported
@ -1192,6 +1148,60 @@ AC_SUBST(GUI_TK_LINK)
AC_SUBST(TOOLKIT)
AC_SUBST(TOOLKIT_DEF)
dnl ----------------------------------------------------------------
dnl select dynamic loader (used by iODBC to load drivers)
dnl ----------------------------------------------------------------
DL_LIBRARY=-ldl
AC_SUBST(DL_LIBRARY)
dnl ----------------------------------------------------------------
dnl thread support
dnl ----------------------------------------------------------------
USE_THREADS=1
THREADS_LINK=""
UNIX_THREAD=""
AC_ARG_WITH(threads,
[ --without-threads Force disabling threads ],
[USE_THREADS="$withval"])
if test "$USE_THREADS" = "1"; then
UNIX_THREAD="gtk/threadno.cpp"
dnl For glibc 2 users who have the old libc 5 too
AC_CHECK_LIB(pthread-0.7, pthread_create, [
UNIX_THREAD="gtk/threadpsx.cpp"
THREADS_LINK="-lpthread-0.7"
AC_DEFINE(USE_THREADS)
],[
AC_CHECK_LIB(pthread, pthread_create, [
UNIX_THREAD="gtk/threadpsx.cpp"
THREADS_LINK="-lpthread"
AC_DEFINE(USE_THREADS)
])
])
AC_CHECK_LIB(pthreads, pthread_create, [
UNIX_THREAD="gtk/threadpsx.cpp"
THREADS_LINK="-lpthreads"
AC_DEFINE(USE_THREADS)
])
AC_CHECK_HEADER(sys/prctl.h, [
UNIX_THREAD="gtk/threadsgi.cpp"
AC_DEFINE(USE_THREADS)
])
fi
AC_SUBST(UNIX_THREAD)
AC_SUBST(THREADS_LINK)
dnl defines UNIX_THREAD it contains the source file to use for threads. (GL)
dnl defines THREADS_LINK it contains the thread library to link with. (GL)
dnl defines USE_THREADS if thread support is activated. (GL)
dnl ----------------------------------------------------------------
dnl search for opengl
dnl ----------------------------------------------------------------

11
samples/forty/playerdg.cpp
View File

@ -59,18 +59,13 @@ PlayerSelectionDialog::PlayerSelectionDialog(
0, 0,
wxLB_SINGLE
);
#if 1
// Robert Roebling
int numPlayers = 0;
wxString* players = 0;
m_scoreFile->GetPlayerList(&players, numPlayers);
for (int i = 0; i < numPlayers; i++)
wxArrayString players;
m_scoreFile->GetPlayerList(players);
for (int i = 0; i < players.Count(); i++)
{
list->Append(players[i]);
}
delete players;
#endif
m_textField = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, 0);

8
samples/forty/scoredg.cpp
View File

@ -58,14 +58,13 @@ ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile) :
m_font = wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxNORMAL);
#endif
wxString* players = 0;
int length = 0;
scoreFile->GetPlayerList(&players, length);
wxArrayString players;
scoreFile->GetPlayerList( players);
ostrstream os;
os << "Player\tWins\tGames\tScore\n";
for (int i = 0; i < length; i++)
for (int i = 0; i < players.Count(); i++)
{
int wins, games, score;
scoreFile->ReadPlayersScore(players[i], wins, games, score);
@ -84,7 +83,6 @@ ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile) :
char* str = os.str();
m_text = str;
delete str;
delete players;
}
ScoreCanvas::~ScoreCanvas()

30
samples/forty/scorefil.cpp
View File

@ -41,8 +41,8 @@
ScoreFile::ScoreFile(const char* appName)
{
#ifdef 0
wxString filename;
#ifdef __WXGTK__
m_configFilename << "/usr/local/share/" << appName << ".scores";
if (access(m_configFilename, F_OK) == 0)
{
@ -67,11 +67,13 @@ ScoreFile::ScoreFile(const char* appName)
close(fd);
}
}
#else
// Windows
m_configFilename = wxFileConfig::GetGlobalFileName(appName);
#endif
m_config = new wxFileConfig(m_configFilename);
#ifdef __UNIX__
m_config = new wxFileConfig( appName, "" ); // only local
#else
m_config = new wxFileConfig( "",appName ); // only global
#endif
}
ScoreFile::~ScoreFile()
@ -85,27 +87,23 @@ ScoreFile::~ScoreFile()
}
void ScoreFile::GetPlayerList(wxString** list, int& length)
void ScoreFile::GetPlayerList( wxArrayString &list )
{
m_config->SetPath("/Players");
length = m_config->GetNumberOfGroups();
int length = m_config->GetNumberOfGroups();
if (length <= 0)
{
*list = 0;
return;
}
*list = new wxString[length];
if (length <= 0) return;
wxString player;
long index, i = 0;
if (m_config->GetFirstGroup(player, index))
{
(*list)[i++] = player;
list.Add( player );
i++;
while (m_config->GetNextGroup(player, index))
{
(*list)[i++] = player;
list.Add( player );
i++;
}
}
}

2
samples/forty/scorefil.h
View File

@ -20,7 +20,7 @@ public:
ScoreFile(const char* appName);
virtual ~ScoreFile();
void GetPlayerList(wxString** list, int& number);
void GetPlayerList( wxArrayString &list );
wxString GetPreviousPlayer() const;
void ReadPlayersScore(const char* player, int& wins, int& games, int &score);

4
src/gtk/dcclient.cpp
View File

@ -545,7 +545,7 @@ void wxPaintDC::Clear(void)
{
if (!Ok()) return;
DestroyClippingRegion();
// DestroyClippingRegion();
if (m_isDrawable)
{
@ -556,7 +556,7 @@ void wxPaintDC::Clear(void)
int width = 0;
int height = 0;
GetSize( &width, &height );
gdk_draw_rectangle( m_window, m_brushGC, TRUE, 0, 0, width, height );
gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
};
};

20
src/gtk/menu.cpp
View File

@ -122,19 +122,31 @@ wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
return result;
}
bool wxMenuBar::IsChecked( int id ) const
void wxMenuBar::Check( int id, bool check )
{
wxMenuItem* item = FindMenuItemById( id );
if (item) item->Check(check);
};
bool wxMenuBar::Checked( int id ) const
{
wxMenuItem* item = FindMenuItemById( id );
if (item) return item->IsChecked();
return FALSE;
}
};
bool wxMenuBar::IsEnabled( int id ) const
void wxMenuBar::Enable( int id, bool enable )
{
wxMenuItem* item = FindMenuItemById( id );
if (item) item->Enable(enable);
};
bool wxMenuBar::Enabled( int id ) const
{
wxMenuItem* item = FindMenuItemById( id );
if (item) return item->IsEnabled();
return FALSE;
}
};
//-----------------------------------------------------------------------------
// wxMenu

4
src/gtk1/dcclient.cpp
View File

@ -545,7 +545,7 @@ void wxPaintDC::Clear(void)
{
if (!Ok()) return;
DestroyClippingRegion();
// DestroyClippingRegion();
if (m_isDrawable)
{
@ -556,7 +556,7 @@ void wxPaintDC::Clear(void)
int width = 0;
int height = 0;
GetSize( &width, &height );
gdk_draw_rectangle( m_window, m_brushGC, TRUE, 0, 0, width, height );
gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
};
};

20
src/gtk1/menu.cpp
View File

@ -122,19 +122,31 @@ wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
return result;
}
bool wxMenuBar::IsChecked( int id ) const
void wxMenuBar::Check( int id, bool check )
{
wxMenuItem* item = FindMenuItemById( id );
if (item) item->Check(check);
};
bool wxMenuBar::Checked( int id ) const
{
wxMenuItem* item = FindMenuItemById( id );
if (item) return item->IsChecked();
return FALSE;
}
};
bool wxMenuBar::IsEnabled( int id ) const
void wxMenuBar::Enable( int id, bool enable )
{
wxMenuItem* item = FindMenuItemById( id );
if (item) item->Enable(enable);
};
bool wxMenuBar::Enabled( int id ) const
{
wxMenuItem* item = FindMenuItemById( id );
if (item) return item->IsEnabled();
return FALSE;
}
};
//-----------------------------------------------------------------------------
// wxMenu